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
..
discontig_32.c	Merge branch 'x86/mpparse' into x86/devel	2008-07-08 11:14:58 +02:00
dump_pagetables.c	x86_64: use PAGE_OFFSET in dump_pagetables	2008-07-08 08:12:06 +02:00
extable.c
fault.c	Merge branches 'x86/mmio', 'x86/delay', 'x86/idle', 'x86/oprofile', 'x86/debug', 'x86/ptrace' and 'x86/amd-iommu' into x86/devel	2008-07-08 09:46:15 +02:00
highmem_32.c	x86: unexport kmap_atomic_to_page	2008-04-30 23:15:34 +02:00
hugetlbpage.c
init_32.c	Merge branch 'x86/mpparse' into x86/devel	2008-07-08 11:14:58 +02:00
init_64.c	x86: add flags parameter to reserve_bootmem_generic()	2008-07-08 11:49:49 +02:00
ioremap.c	Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build', 'x86/cleanups', 'x86/cpa', 'x86/cpu', 'x86/defconfig', 'x86/gart', 'x86/i8259', 'x86/intel', 'x86/irqstats', 'x86/kconfig', 'x86/ldt', 'x86/mce', 'x86/memtest', 'x86/pat', 'x86/ptemask', 'x86/resumetrace', 'x86/threadinfo', 'x86/timers', 'x86/vdso' and 'x86/xen' into x86/devel	2008-07-08 09:16:56 +02:00
k8topology_64.c	Merge branch 'x86/mpparse' into x86/devel	2008-07-08 11:14:58 +02:00
Makefile	x86: add common mm/pgtable.c	2008-04-24 23:57:30 +02:00
mmap.c
numa_64.c	Merge branch 'x86/numa' into x86/devel	2008-07-08 11:59:23 +02:00
pageattr-test.c
pageattr.c	Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build', 'x86/cleanups', 'x86/cpa', 'x86/cpu', 'x86/defconfig', 'x86/gart', 'x86/i8259', 'x86/intel', 'x86/irqstats', 'x86/kconfig', 'x86/ldt', 'x86/mce', 'x86/memtest', 'x86/pat', 'x86/ptemask', 'x86/resumetrace', 'x86/threadinfo', 'x86/timers', 'x86/vdso' and 'x86/xen' into x86/devel	2008-07-08 09:16:56 +02:00
pat.c	x86: pat.c final cleanup of loop body in reserve_memtype	2008-06-24 13:05:59 +02:00
pgtable_32.c	x86: fix PAE pmd_bad bootup warning	2008-05-06 13:08:58 -07:00
pgtable.c	x86: fixup the fallout of the bitops changes	2008-05-25 08:58:36 +02:00
srat_64.c	Merge branch 'x86/numa' into x86/devel	2008-07-08 11:59:23 +02:00