Ingo Molnar 8460b3e5bc Merge commit 'v2.6.38' into x86/mm ... Conflicts: arch/x86/mm/numa_64.c Merge reason: Resolve the conflict, update the branch to .38. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2011-03-15 08:29:44 +01:00
..
kmemcheck
amdtopology_64.c	x86-64, NUMA: Unify emulated distance mapping	2011-02-16 17:11:10 +01:00
dump_pagetables.c
extable.c
fault.c	x86/mm: Fix pgd_lock deadlock	2011-03-10 09:41:57 +01:00
gup.c
highmem_32.c
hugetlbpage.c
init_32.c	x86: Rename e820_table_* to pgt_buf_*	2011-02-24 14:52:18 +01:00
init_64.c	Merge commit 'v2.6.38' into x86/mm	2011-03-15 08:29:44 +01:00
init.c	x86: Rename e820_table_* to pgt_buf_*	2011-02-24 14:52:18 +01:00
iomap_32.c
ioremap.c
kmmio.c
Makefile	x86-64, NUMA: Move NUMA emulation into numa_emulation.c	2011-02-22 11:10:08 +01:00
memblock.c
memtest.c
mmap.c
mmio-mod.c
numa_32.c	x86, NUMA: Move *_numa_init() invocations into initmem_init()	2011-02-16 12:13:06 +01:00
numa_64.c	x86, numa: Fix numa_emulation code with memory-less node0	2011-03-04 15:20:19 +01:00
numa_emulation.c	x86-64, NUMA: Don't call numa_set_distanc() for all possible node combinations during emulation	2011-03-12 11:41:10 +01:00
numa_internal.h	x86-64, NUMA: Move NUMA emulation into numa_emulation.c	2011-02-22 11:10:08 +01:00
numa.c	x86, numa: Add error handling for bad cpu-to-node mappings	2011-02-14 13:29:27 +01:00
pageattr-test.c
pageattr.c	x86/mm: Fix pgd_lock deadlock	2011-03-10 09:41:57 +01:00
pat_internal.h
pat_rbtree.c
pat.c
pf_in.c
pf_in.h
pgtable_32.c
pgtable.c	x86/mm: Fix pgd_lock deadlock	2011-03-10 09:41:57 +01:00
physaddr.c
physaddr.h
setup_nx.c
srat_32.c
srat_64.c	x86-64, NUMA: Unify emulated distance mapping	2011-02-16 17:11:10 +01:00
testmmiotrace.c
tlb.c	x86: Avoid tlbstate lock if not enough cpus	2011-02-14 13:03:08 +01:00