Merge branch 'linus' into x86/apic
authorThomas Gleixner <tglx@linutronix.de>
Wed, 5 Aug 2015 21:55:52 +0000 (23:55 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 5 Aug 2015 22:00:32 +0000 (00:00 +0200)
Pull in upstream changes to avoid conflicts


Trivial merge