tree f681f808db3d5df5d7987199c8224031982bcf3f
parent 4fafd5b03875612a24a5b17dac0c63217a65de42
parent e2494e1b42ebac402324105d57646489d19e2b01
author Ingo Molnar <mingo@elte.hu> 1239104449 +0200
committer Ingo Molnar <mingo@elte.hu> 1239104455 +0200

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>