Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Sat, 19 Sep 2009 09:27:32 +0000 (11:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 19 Sep 2009 09:28:41 +0000 (11:28 +0200)
Merge reason: Bring in tracing changes we depend on.

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

Trivial merge