]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'tracing/blktrace-fixes' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:40:49 +0000 (13:40 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:40:55 +0000 (13:40 +0200)
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>

Trivial merge