]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit96d9f3fb08e6643fffdc48bd15854cb40293e661
treef78d0d13faa406524a58d9ce64756ffdabb64400
parent2093790431f12a088622e9cf85c9243159ec3c6a
parent851caf2ce0c2b85fffbbc07b3c5496cd95835226
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