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)
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>
1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile

Simple merge