tree 40749c2a0d71e6ad89a9664eec01842543e3ba53
parent 05ac65305437e8ef63d2d19cac704138a2a05aa5
parent 021f653791ad17e03f98aaa7fb933816ae16f161
author Catalin Marinas <catalin.marinas@arm.com> 1406289802 +0100
committer Catalin Marinas <catalin.marinas@arm.com> 1406289802 +0100

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