Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 24 Apr 2013 18:33:46 +0000 (20:33 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 24 Apr 2013 18:33:54 +0000 (20:33 +0200)
Reason: Get upstream fixes before adding conflicting code.

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

Trivial merge