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)
Conflicts:
drivers/irqchip/irq-gic.c


Trivial merge