Merge tag 'renesas-boards2-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 22 Mar 2013 12:41:45 +0000 (13:41 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 22 Mar 2013 12:41:45 +0000 (13:41 +0100)
commit271c8f9afae76a897408c277f9fae4c28bc0c64d
tree6b17d7f8305bf60b0931a4e9265ed0c097c55fe9
parent8f07b1d580fdbbc21969319d4208a15f5280d04e
parentac22dde76c80a3ffa3c3c24cf16bb8076b20b767
Merge tag 'renesas-boards2-for-v3.10' of git://git./linux/kernel/git/horms/renesas into next/boards

From Simon Horman <horms+renesas@verge.net.au>:

Second round of Renesas ARM-based SoC board updates for v3.10

* Resolve a build regression on Mackerel by reverting
  "ARM: shmobile: streamline mackerel SD and MMC devices"
* DTS cleanup and corrections for kzm9g/sh73a0 from Guennadi
* SDHI voltage regulator enhancements for kzm9g and armadillo800eva
  from Guennadi

* tag 'renesas-boards2-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  Revert "ARM: shmobile: streamline mackerel SD and MMC devices"
  ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names
  ARM: shmobile: kzm9g: add fixed voltage regulators for SDHI0 and SDHI2
  ARM: shmobile: armadillo800eva: add a fixed voltage regulator for SDHI1
  ARM: shmobile: sh73a0: move SDHI and MMCIF DT nodes to sh73a0.dtsi
  ARM: shmobile: kzm9g: SDHI0 and SDHI1 use a 3.3V power supply

Signed-off-by: Arnd Bergmann <arnd@arndb.de>