diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 13:40:49 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 13:40:55 +0200 |
commit | a053958f073740219df1da596b42bfefdab634c4 (patch) | |
tree | f681f808db3d5df5d7987199c8224031982bcf3f /kernel/trace/trace_sched_wakeup.c | |
parent | 4fafd5b03875612a24a5b17dac0c63217a65de42 (diff) | |
parent | e2494e1b42ebac402324105d57646489d19e2b01 (diff) | |
download | talos-obmc-linux-a053958f073740219df1da596b42bfefdab634c4.tar.gz talos-obmc-linux-a053958f073740219df1da596b42bfefdab634c4.zip |
Merge branch 'tracing/blktrace-fixes' into tracing/urgent
Merge reason: this used to be a tracing/blktrace-v2 devel topic still
cooking during the merge window - has propagated to fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_sched_wakeup.c')
0 files changed, 0 insertions, 0 deletions