Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 19 May 2015 14:12:32 +0000 (16:12 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 19 May 2015 14:12:32 +0000 (16:12 +0200)
Make sure the upstream fixes are applied before adding further
modifications.


Trivial merge