OSDN Git Service

Merge branch 'drivers/mmc' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:48:45 +0000 (21:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 May 2012 11:31:11 +0000 (13:31 +0200)
commitc49314fa6c7d2c130d850b30980cffab53a40592
tree9c7597ad98a42ef8ba1e18e897106c2cb29e52e6
parent21b7f153dd0d7366197c37e7a630c7585db0b8ea
parent7f217794ffa72f208a250b79ab0b7ea3de19677f
Merge branch 'drivers/mmc' into next/drivers

* drivers/mmc:
  mmc: dt: Consolidate DT bindings

Also pulls in the omap/dt-missed-3.4 branch as a dependency.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/tegra-cardhu.dts
arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-paz00.dts
arch/arm/boot/dts/tegra-seaboard.dts
arch/arm/boot/dts/tegra-ventana.dts