Merge branch 'tracing/blktrace-fixes' into tracing/urgent
commita053958f073740219df1da596b42bfefdab634c4
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:40:49 +0000 (7 13:40 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:40:55 +0000 (7 13:40 +0200)
treef681f808db3d5df5d7987199c8224031982bcf3f
parent4fafd5b03875612a24a5b17dac0c63217a65de42
parente2494e1b42ebac402324105d57646489d19e2b01
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>