Merge branch 'tracing/sysprof' into auto-ftrace-next
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:08 +0000 (11:43 +0200)
commitec1bb60bbff0386c3ec25360e7a8c72f467a6ff1
tree893c04336763acd84d575fd713773b882e8bc8a6
parent5373fdbdc1dba69aa956098650f71b731d471885
parent37f5d732f34fa099676b2c52b8a57bab01a011de
Merge branch 'tracing/sysprof' into auto-ftrace-next
kernel/trace/Makefile
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_selftest.c