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)
commitd267b8d6c65ed7636a412ca479b96df7c0f5b27b
treef613d83fab377bf3599eb9ffc3cdf34df0a6e48e
parent42baa2581c92f8d07e7260506c8d41caf14b0fc3
parent1eab0e42450c6038e2bb17da438370fe639973f3
Merge branch 'linus' into x86/apic

Pull in update changes so we can apply conflicting patches