Merge branch 'tracing/function-return-tracer' into tracing/fastboot
commit60a011c736e7dd09a0b01ca6a051a416f3f52ffb
authorIngo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 09:17:09 +0000 (12 10:17 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 09:17:09 +0000 (12 10:17 +0100)
tree20e91db58c3bbfa622d3ed8ec747e4974a807284
parentd06bbd669539215405874d8fe32ab65105e6c4bb
parent19b3e9671c5a219b8c34da2cc66e0ce7c3a501ae
Merge branch 'tracing/function-return-tracer' into tracing/fastboot
arch/x86/Kconfig
include/linux/sched.h
kernel/trace/ftrace.c