Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tracing...
authorIngo Molnar <mingo@elte.hu>
Mon, 3 Nov 2008 09:34:23 +0000 (10:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 3 Nov 2008 09:34:23 +0000 (10:34 +0100)
commit7a895f53cda9d9362c30144e42c124a1ae996b9e
treee2a793cfc289015ec54d2cba5140d0171f734629
parentd9e540762f5cdd89f24e518ad1fd31142d0b9726
parent5d9881ea1440f046ee851bbaa2a2962543336a11
parentfd3fdf11d3c649769e02459c5f1b8081a15e9007
parenta26a2a27396c0a0877aa701f8f92d08ba550a6c9
parent127cafbb276266b1b8da967bfe25a062ab1d42ab
parentc2c80529460095035752bf0ecc1af82c1e0f6e0f
Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tracing/nmisafe', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core
include/linux/ftrace.h
kernel/trace/trace.c