]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/for-next
authorJason Cooper <jason@lakedaemon.net>
Thu, 2 Apr 2015 23:24:33 +0000 (23:24 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 2 Apr 2015 23:24:33 +0000 (23:24 +0000)
commit7ecc79901e08c47de52f6eb45185d516060f4ac5
tree76cc7bf82204fe8e776c4b2b9684b390fbd6f408
parent12aa3d6d20eb82e91e5a118675a46de960a4b23e
parent008e4d6735091bfe5be12918cb66c55e178361bf
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/for-next

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