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)
commitb7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8
tree221d6c5be36fa3b2133200ebc3e520d4382dca8f
parentc948c26048ecb1023d2e68222c736f7da41da498
parentcbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f
Merge branch 'linus' into x86/apic

Pull in upstream changes to avoid conflicts
arch/x86/kernel/apic/vector.c
arch/x86/kernel/irq.c