diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 12:19:39 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 12:19:39 +0200 |
| commit | 3f5099f0c7677d2f1710408530d2d6ab114aad32 (patch) | |
| tree | 72004d8d75079ea0b7cab61930323efc8bde061c /arch/arm/mach-zynq | |
| parent | 944d01c5f5e9a99ef7afb16d8b79cb1b66607bbd (diff) | |
| parent | 0c2bf9f95983fe30aa2f6463cb761cd42c2d521a (diff) | |
Merge tag 'arm-soc/for-4.11/devicetree-fixes' of http://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>
Diffstat (limited to 'arch/arm/mach-zynq')
0 files changed, 0 insertions, 0 deletions