Merge branch 'tracing/ftrace' into auto-ftrace-next
commit6712e299b7dc78aa4971b85e803435ee6d49a9dd
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 13:58:35 +0000 (14 15:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 13:58:35 +0000 (14 15:58 +0200)
treeb3d17a2d068737ec07727b28e93c7d374c27721b
parentec1bb60bbff0386c3ec25360e7a8c72f467a6ff1
parentb2613e370dbeb69edbff989382fa54f2395aa471
Merge branch 'tracing/ftrace' into auto-ftrace-next
kernel/trace/trace.c
kernel/trace/trace.h