android_kernel_xiaomi_sm8350/drivers/base
Ingo Molnar 2b4fa851b2 Merge branch 'x86/numa' into x86/devel
Conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/e820.c
	arch/x86/kernel/efi_64.c
	arch/x86/kernel/mpparse.c
	arch/x86/kernel/setup.c
	arch/x86/kernel/setup_32.c
	arch/x86/mm/init_64.c
	include/asm-x86/proto.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-08 11:59:23 +02:00
..
power
attribute_container.c
base.h
bus.c
class.c
core.c
cpu.c
dd.c
devres.c
dma-mapping.c
driver.c
firmware_class.c
firmware.c
hypervisor.c
init.c
isa.c
Kconfig
Makefile
map.c
memory.c
module.c
node.c
platform.c
sys.c
topology.c x86: cleanup early per cpu variables/accesses v4 2008-07-08 11:31:20 +02:00
transport_class.c