android_kernel_xiaomi_sm8350/arch/x86/mm
Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus
Conflicts:

	arch/powerpc/Kconfig
	arch/s390/kernel/time.c
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/cpu/perfctr-watchdog.c
	arch/x86/kernel/i8259_64.c
	arch/x86/kernel/ldt.c
	arch/x86/kernel/nmi_64.c
	arch/x86/kernel/smpboot.c
	arch/x86/xen/smp.c
	include/asm-x86/hw_irq_32.h
	include/asm-x86/hw_irq_64.h
	include/asm-x86/mach-default/irq_vectors.h
	include/asm-x86/mach-voyager/irq_vectors.h
	include/asm-x86/smp.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-15 21:55:59 +02:00
..
discontig_32.c x86: remove have_arch_parse_srat -v2 2008-07-08 15:49:01 +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 branch 'auto-ftrace-next' into tracing/for-linus 2008-07-14 16:11:52 +02:00
highmem_32.c
hugetlbpage.c
init_32.c Merge branch 'auto-ftrace-next' into tracing/for-linus 2008-07-14 16:11:52 +02:00
init_64.c Merge branch 'auto-ftrace-next' into tracing/for-linus 2008-07-14 16:11:52 +02:00
ioremap.c Merge branch 'auto-ftrace-next' into tracing/for-linus 2008-07-14 16:11:52 +02:00
k8topology_64.c x86: remove end_pfn in 64bit 2008-07-08 13:10:38 +02:00
kmmio.c - fix mmioftrace + rcu merge interaction 2008-05-25 09:51:43 +02:00
Makefile Merge branch 'auto-ftrace-next' into tracing/for-linus 2008-07-14 16:11:52 +02:00
mmap.c
mmio-mod.c x86 mmiotrace: page level is unsigned 2008-05-24 11:27:47 +02:00
numa_64.c x86: remove end_pfn in 64bit 2008-07-08 13:10:38 +02:00
pageattr-test.c x86/cpa: use an undefined PTE bit for testing CPA 2008-07-08 13:16:30 +02:00
pageattr.c Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
pat.c x86: max_low_pfn_mapped fix, #2 2008-07-13 08:19:16 +02:00
pf_in.c x86 mmiotrace: move files into arch/x86/mm/. 2008-05-24 11:25:37 +02:00
pf_in.h x86 mmiotrace: move files into arch/x86/mm/. 2008-05-24 11:25:37 +02:00
pgtable_32.c arch/x86/mm/pgtable_32.c: remove unused variable `fixmaps' 2008-07-09 08:18:40 +02:00
pgtable.c x86: preallocate and prepopulate separately 2008-07-08 13:11:02 +02:00
srat_32.c x86: remove acpi_srat config v2 2008-07-08 15:49:08 +02:00
srat_64.c x86: reserve SLIT 2008-07-11 10:22:33 +02:00
testmmiotrace.c mmiotrace: code style cleanups 2008-05-24 11:27:28 +02:00