Merge branch 'linus' into perf/core
authorThomas Gleixner <tglx@linutronix.de>
Mon, 28 Jun 2010 20:33:13 +0000 (22:33 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 28 Jun 2010 20:33:24 +0000 (22:33 +0200)
Reason: Further changes conflict with upstream fixes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Trivial merge