summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-27 10:56:13 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-27 10:56:13 +0100
commitc7cc77307669336a08928ab8668bdb3f3bcc021b (patch)
treec9f2997a7266cc5d8c5b61e964d8e014f274f5d3 /scripts
parent0bfc24559d7945506184d86739fe365a181f06b7 (diff)
parentd144d5ee6a265823d39f75ecfed351a516295183 (diff)
parent437f24fb897d409a9978eb71ecfaf279dcd94acd (diff)
parentf3f47a6768a29448866da4422b6f6bee485c947f (diff)
Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/power-tracer' into tracing/core