]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'irqchip/irqchip/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:27:37 +0000 (15:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:27:37 +0000 (15:27 +1000)
commit1deb40f05b7609905dad695dbe414b1299f150d3
tree3fadb52a15d556f2b162bc7faef9b784ebe2b17a
parentc378d2419f42a38f49adf6498a342c4a537fb2b3
parent7ecc79901e08c47de52f6eb45185d516060f4ac5
Merge remote-tracking branch 'irqchip/irqchip/for-next'

Conflicts:
arch/arm/mach-exynos/suspend.c
26 files changed:
Documentation/devicetree/bindings/arm/gic.txt
Documentation/devicetree/bindings/arm/samsung/pmu.txt
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra72-evm.dts
arch/arm/boot/dts/dra72x.dtsi
arch/arm/boot/dts/dra74x.dtsi
arch/arm/boot/dts/exynos3250.dtsi
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/boot/dts/exynos5420.dtsi
arch/arm/boot/dts/omap4-panda-common.dtsi
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/tegra124.dtsi
arch/arm/mach-exynos/exynos.c
arch/arm/mach-exynos/suspend.c
arch/arm/mach-omap2/omap4-common.c
arch/arm/mach-tegra/tegra.c
drivers/irqchip/Kconfig
drivers/irqchip/Makefile
drivers/irqchip/irq-gic.c