]> 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)
commit37be2f41c0f415b06f37194249beb162f158aa80
treef78d0d13faa406524a58d9ce64756ffdabb64400
parent0ecba169374054abb17d7763374b902db3f7e0e4
parent7c0dc0c9e4cce31d60620e314708febe621c0a46
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