original_kernel/arch/x86/mm
Ingo Molnar 1c2a48cf65 Merge branch 'linus' into x86/apic-cleanups
Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: Resolve the conflict, update to a more recent -rc base

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-01-07 14:14:15 +01:00
..
kmemcheck x86: Eliminate bp argument from the stack tracing routines 2010-11-18 14:37:34 +01:00
Makefile x86, amd-nb: Complete the rename of AMD NB and related code 2010-11-18 15:53:04 +01:00
amdtopology_64.c x86, apic: Remove early_init_lapic_mapping() 2010-12-09 21:52:04 +01:00
dump_pagetables.c
extable.c
fault.c x86: access_error API cleanup 2010-10-26 16:52:09 -07:00
gup.c
highmem_32.c mm: fix race in kunmap_atomic() 2010-10-27 18:03:05 -07:00
hugetlbpage.c
init.c x86: Add NX protection for kernel data 2010-11-18 12:52:04 +01:00
init_32.c x86: Add NX protection for kernel data 2010-11-18 12:52:04 +01:00
init_64.c x86: Resume trampoline must be executable 2010-11-22 14:38:52 +01:00
iomap_32.c mm: fix race in kunmap_atomic() 2010-10-27 18:03:05 -07:00
ioremap.c xen: Cope with unmapped pages when initializing kernel pagetable 2010-10-13 16:07:13 -07:00
kmmio.c
memblock.c x86, memblock: Remove __memblock_x86_find_in_range_size() 2010-10-05 21:45:43 -07:00
memtest.c
mmap.c
mmio-mod.c
numa.c
numa_32.c x86-32, memblock: Make add_highpages honor early reserved ranges 2010-10-05 21:44:35 -07:00
numa_64.c x86, amd-nb: Complete the rename of AMD NB and related code 2010-11-18 15:53:04 +01:00
pageattr-test.c
pageattr.c x86: Add NX protection for kernel data 2010-11-18 12:52:04 +01:00
pat.c
pat_internal.h
pat_rbtree.c
pf_in.c
pf_in.h
pgtable.c Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-10-21 13:53:24 -07:00
pgtable_32.c
physaddr.c
physaddr.h
setup_nx.c x86, cpu: Only CPU features determine NX capabilities 2010-11-10 15:43:15 -08:00
srat_32.c x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation 2010-12-23 13:16:18 -08:00
srat_64.c x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation 2010-12-23 13:16:18 -08:00
testmmiotrace.c
tlb.c x86: Use online node real index in calulate_tbl_offset() 2010-11-18 10:10:50 +01:00