Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 7 May 2009 09:17:13 +0000 (11:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 7 May 2009 09:17:34 +0000 (11:17 +0200)
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

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

Trivial merge