summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-01-07 10:26:22 +0100
committerIngo Molnar <mingo@elte.hu>2010-01-07 10:26:22 +0100
commitff2576674c19c4b74acc4f6cc9bac3b94916350b (patch)
tree01f648599bfeed726f25c337b695129c4222b32f /scripts
parent2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff)
parent0e1ff5d72a6393f2ef5dbf74f58bb55a12d63834 (diff)
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions