Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
authorJason Cooper <jason@lakedaemon.net>
Fri, 10 Apr 2015 22:58:19 +0000 (22:58 +0000)
committerJason Cooper <jason@lakedaemon.net>
Fri, 10 Apr 2015 22:58:19 +0000 (22:58 +0000)
commita01e7b3258bea93fbf1f028fab1c739d80c61823
treef78d0d13faa406524a58d9ce64756ffdabb64400
parentfb414e908b15ae3d704aa0572f77981a516279b9
parent008e4d6735091bfe5be12918cb66c55e178361bf
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core

Conflicts:
drivers/irqchip/irq-gic.c
drivers/irqchip/irq-gic.c
include/linux/irqchip/arm-gic.h