git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

author	Arnd Bergmann <arnd@arndb.de>
	Wed, 14 Sep 2016 20:48:29 +0000 (22:48 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Wed, 14 Sep 2016 20:48:29 +0000 (22:48 +0200)
commit	37179033fc98156ce5cd360ff658da3e1fb01a56
tree	87694304b2850605fb225aac186b6d8cd5072659	tree \| snapshot
parent	78dc6663a8c12e9d45e7862e3a2c83c68f4a06cf	commit \| diff
parent	f2a89d3b2b85b90b05453872aaabfdb412a21a03	commit \| diff

Merge branch 'dt/irq-fix' into next/dt64

* dt/irq-fix:
arm64: dts: Fix broken architected timer interrupt trigger

This resolves a non-obvious conflict between a bugfix from
v4.8 and a cleanup for the exynos7 platform.

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

arch/arm64/boot/dts/broadcom/ns2.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/exynos/exynos7.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/marvell/armada-ap806.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi	diff1 \|	\|	blob \| history
arch/arm64/boot/dts/xilinx/zynqmp.dtsi	diff1 \|	diff2 \|	blob \| history