Merge branch 'linus' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Sun, 9 Aug 2009 10:46:45 +0000 (12:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 9 Aug 2009 10:46:49 +0000 (12:46 +0200)
Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
              (on which we'll queue up a dependent fix)

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

Trivial merge