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

2.1 KiB

Raw Blame History

View Raw