Merge branch 'tracing/ftrace' into auto-ftrace-next
Ingo Molnar [Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)]
1  2 
Makefile
arch/x86/Kconfig
arch/x86/mm/init_64.c
kernel/printk.c
kernel/sched.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc kernel/printk.c
Simple merge
diff --cc kernel/sched.c
Simple merge