Merge branch 'linus' into x86/apic
authorThomas Gleixner <tglx@linutronix.de>
Sat, 19 Dec 2015 10:03:18 +0000 (11:03 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 19 Dec 2015 10:03:18 +0000 (11:03 +0100)
Pull in update changes so we can apply conflicting patches


Trivial merge