Merge branch 'irqchip/broadcom' into irqchip/core
authorJason Cooper <jason@lakedaemon.net>
Thu, 2 Oct 2014 13:04:45 +0000 (13:04 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 2 Oct 2014 13:04:45 +0000 (13:04 +0000)
Conflicts:
drivers/irqchip/Makefile


Trivial merge