]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'next/arm64' into next/dt
authorOlof Johansson <olof@lixom.net>
Tue, 10 Nov 2015 00:35:19 +0000 (16:35 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 10 Nov 2015 00:35:19 +0000 (16:35 -0800)
Merging in the few patches I had kept separate from main next/dt, since others
got merged here directly.

* 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
  arm64: dts: mt8173: Add clocks for SCPSYS unit
  arm64: dts: mt8173: Add subsystem clock controller device nodes
  + Linux 4.3-rc5

1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/boot/dts/exynos5250-smdk5250.dts
arch/arm/boot/dts/r8a7790.dtsi
arch/arm/boot/dts/r8a7791.dtsi
arch/arm64/boot/dts/arm/juno-r1.dts
arch/arm64/configs/defconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge