Merge branch 'for-upstream/juno-dts' of git://linux-arm.org/linux-ld into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 22 May 2015 15:33:12 +0000 (17:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 22 May 2015 15:33:12 +0000 (17:33 +0200)
commit41275490f7479be6a32a7b019ec13f3b4ff8c232
tree42e0586914c5ee72ac7dd97c7ff089ba40eca8f8
parent898a7f36c661a2121f77212f1337115b9e3527b5
parent41e177b37bd558980d50609116f7810b46fe4ce0
Merge branch 'for-upstream/juno-dts' of git://linux-arm.org/linux-ld into next/dt

Merge "Documentation: bindings: Add DT bindings for ARM Juno boards" from Liviu Dudau:

* 'for-upstream/juno-dts' of git://linux-arm.org/linux-ld:
  Documentation: bindings: Add DT bindings for ARM Juno boards.
  arm64: Add DT support for Juno r1 board.
  arm64: Juno: Add GICv2m support in device tree.
  arm64: Juno: Add memory mapped timer node
  arm64: Juno: Split juno.dts into juno-base.dtsi and juno.dts.
  arm64: Juno: Fix the GIC node address label and the frequency of FAXI clock.