Ingo Molnar 5806b81ac1 Merge branch 'auto-ftrace-next' into tracing/for-linus ...

Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2008-07-14 16:11:52 +02:00

..

discontig_32.c

x86: remove have_arch_parse_srat -v2

2008-07-08 15:49:01 +02:00

dump_pagetables.c

…

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

…

Makefile

Merge branch 'auto-ftrace-next' into tracing/for-linus

2008-07-14 16:11:52 +02:00

mmap.c

…

mmio-mod.c

…

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 'auto-ftrace-next' into tracing/for-linus

2008-07-14 16:11:52 +02:00

pat.c

x86: max_low_pfn_mapped fix, #2

2008-07-13 08:19:16 +02:00

pf_in.c

…

pf_in.h

…

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

…