Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/ftrace', 'tracin...
commit6f893fb2e89287a4d755f928c3cda9d18440355c
authorIngo Molnar <mingo@elte.hu>
Mon, 24 Nov 2008 16:46:24 +0000 (24 17:46 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 24 Nov 2008 16:46:24 +0000 (24 17:46 +0100)
treee2b2d9b3974567bc25a5298b14660062d6afb871
parent0429149fb5e01edc410648591c19095d2074ee00
parent1d926f2756392c6909f60e0c9fe2a09d5462e376
parent69bb54ec05f57da7f6fac2cec0820cbc970df20f
parent65afa5e603d507014580ead016ec887b49e1afa6
parentcbe2f5a6e84eebb98ab42fc5e58c3cd5b7767349
parent813b8520f5c240c71df55d14095a7b171de264ce
parent033601a32b2012b6948e80e739cca40bff4de4a0
parent958086d1784459be3fe85e4cad79d42b17d33381
parentfb91ee6cf5b8be5360acec577458e29ec7e97e5e
Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/power-tracer', 'tracing/powerpc', 'tracing/ring-buffer', 'tracing/stack-tracer' and 'tracing/urgent' into tracing/core
include/linux/ftrace.h
kernel/trace/Kconfig
kernel/trace/trace.c
kernel/trace/trace_mmiotrace.c