]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6a51f0ece54853f79dcefd541143a912e24b9d9f
tree40749c2a0d71e6ad89a9664eec01842543e3ba53
parent27bdbd5bfbf81578cffbb3f5a2ef867b45019ab4
parentd760ce97deef2bcb3755ac37fa1dc435f5d50835
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