Merge tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu into next/dt
authorOlof Johansson <olof@lixom.net>
Sun, 20 Jul 2014 19:22:56 +0000 (12:22 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 20 Jul 2014 19:22:56 +0000 (12:22 -0700)
commit87adf92b95715ece8c8102e465d0682d57037d22
tree15fab7157c9337d927bc487ee45f17f782f5d106
parentaaaa10b0961f1fca534dea100ace0fc2991a07dd
parentd854fa8a1500bec982ed9cb26b82d96bd5ae8dab
Merge tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu into next/dt

Merge "ARM: mvebu: DT changes for v3.17" from Jason Cooper:

mvebu DT changes for v3.17
 - kirkwood
   * add boards net2big and net5big

 - dove
   * add vendor prefix for SolidRun
   * split CuBox into it's variants

* tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: fix net5big regulator gpio assignments
  ARM: dts: mvebu: split SolidRun CuBox into variants
  dt-binding: add vendor prefix for SolidRun
  ARM: Kirkwood: Add DT descriptions for net2big and net5big.

Signed-off-by: Olof Johansson <olof@lixom.net>
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile