projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 944d01c 0c2bf9f)
Merge tag 'arm-soc/for-4.11/devicetree-fixes' of http://github.com/Broadcom/stblinux...
authorArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 10:19:39 +0000 (12:19 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 10:19:39 +0000 (12:19 +0200)
commit3f5099f0c7677d2f1710408530d2d6ab114aad32
tree72004d8d75079ea0b7cab61930323efc8bde061ctree | snapshot
parent944d01c5f5e9a99ef7afb16d8b79cb1b66607bbdcommit | diff
parent0c2bf9f95983fe30aa2f6463cb761cd42c2d521acommit | diff
Merge tag 'arm-soc/for-4.11/devicetree-fixes' of github.com/Broadcom/stblinux into fixes

There was a little conflict between the v4.11 bugfixes and the new changes for 4.12,
this merges the fixes into the 4.12 branch to avoid having to resolve it again.

* Broadcom fixes in mainline
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  ARM: dts: BCM5301X: Fix memory start address
  ARM: dts: BCM5301X: Fix UARTs on bcm953012k

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/bcm953012k.dts diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git