Merge branch 'for-upstream/juno-pcie' of git://linux-arm.org/linux-ld into next/arm64
authorOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 23:51:50 +0000 (08:51 +0900)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 23:51:50 +0000 (08:51 +0900)
* 'for-upstream/juno-pcie' of git://linux-arm.org/linux-ld:
  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

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge