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)
commitf7472655fbe70f422c08f78d107ca24a791d7b14
tree95eda5f2f5404f2de591546493a12dcf1a0c4c81
parenta778bf35bd928653a0d9c9313a56866be8aab59d
parentfda9203b924a8b4caa68fb4a2df5c954f9eb846a
Merge branch 'irqchip/broadcom' into irqchip/core

Conflicts:
drivers/irqchip/Makefile
drivers/irqchip/Makefile