]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/arm64' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 23:52:48 +0000 (08:52 +0900)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 23:52:48 +0000 (08:52 +0900)
* next/arm64:
  arm64: defconfig: Enable PCI generic host bridge by default
  arm64: Juno: Add support for the PCIe host bridge on Juno R1
  Documentation: of: Document the bindings used by Juno R1 PCIe host bridge

1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm64/boot/dts/arm/juno-r1.dts
arch/arm64/configs/defconfig

Simple merge
Simple merge