Merge tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 25 Jul 2014 12:03:22 +0000 (13:03 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 25 Jul 2014 12:03:22 +0000 (13:03 +0100)
commitecb3c2bbf233d0c8d6e48009afa52c45c0204857
tree40749c2a0d71e6ad89a9664eec01842543e3ba53
parent05ac65305437e8ef63d2d19cac704138a2a05aa5
parent021f653791ad17e03f98aaa7fb933816ae16f161
Merge tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux

* tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux:
  irqchip: gic-v3: Initial support for GICv3
  irqchip: gic: Move some bits of GICv2 to a library-type file

Conflicts:
arch/arm64/Kconfig
arch/arm64/Kconfig
arch/arm64/kernel/head.S