Merge branch 'linus' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 29 Jul 2015 22:13:24 +0000 (00:13 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 29 Jul 2015 22:13:24 +0000 (00:13 +0200)
commit4b979e4c611ce750d32b51737f837b485f43c69b
tree3bc56f2a22d2cf29bc183b67e74e1e8c0733efc0
parent1559f3b8d0527e24219149c95b3de5e7b2924828
parentcbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f
Merge branch 'linus' into irq/core

Pull in upstream fixes before applying conflicting changes
arch/powerpc/sysdev/ppc4xx_hsta_msi.c
drivers/irqchip/irq-gic-v3-its.c
drivers/irqchip/irq-gic.c
drivers/irqchip/irq-mips-gic.c
drivers/irqchip/spear-shirq.c
include/linux/device.h
kernel/irq/internals.h
kernel/irq/resend.c