Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 10:19:57 +0000 (12:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 10:20:01 +0000 (12:20 +0200)
Merge reason: tracing/core was on an older, pre-rc1 base.

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

Trivial merge