From: Catalin Marinas Date: Fri, 25 Jul 2014 12:03:22 +0000 (+0100) Subject: Merge tag 'deps-irqchip-gic-3.17' of git://git.infradead.org/users/jcooper/linux X-Git-Tag: omap-for-v3.17/fixes-against-rc2~183^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecb3c2bbf233d0c8d6e48009afa52c45c0204857;p=pandora-kernel.git 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 --- ecb3c2bbf233d0c8d6e48009afa52c45c0204857 Reading git-diff-tree failed