Merge branch 'linus' into tracing/blktrace
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 08:00:35 +0000 (09:00 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 08:00:35 +0000 (09:00 +0100)
Conflicts:
block/blktrace.c

Semantic merge:
kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge