Merge branch 'sdmmc-dra-linux-3.8.y' of git://git.ti.com/~balajitk/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Fri, 31 May 2013 20:19:19 +0000 (15:19 -0500)
committerDan Murphy <dmurphy@ti.com>
Fri, 31 May 2013 20:19:19 +0000 (15:19 -0500)
commit54d80897fd69e30702f3b6f115d77d37ad78f9ef
tree6e5020e745079b1fc76a33563a93662b17db405f
parent1e5c3f78fdfb27260d1bcb1895f3938b87d3811c
parent4b9f24f488f39a8d19c26f9e484010673d1cd65a
Merge branch 'sdmmc-dra-linux-3.8.y' of git://git.ti.com/~balajitk/ti-linux-kernel/omap-hsmmc into ti-linux-3.8.y

TI-Feature: J6-sd-mmc
TI-Tree: git://git.ti.com/~balajitk/ti-linux-kernel/omap-hsmmc into ti-linux-3.8.y
TI-Branch: sdmmc-dra-linux-3.8.y

* 'sdmmc-dra-linux-3.8.y' of git://git.ti.com/~balajitk/ti-linux-kernel/omap-hsmmc:
  ARM: dra7: dts: Add a fixed regulator node needed for eMMC
  arm/dts: dra7: Add ldo regulator for mmc1
  arm/dts: dra7: Add mmc controller nodes and board data
  ARM: DRA: hwmod: Correct the dma line names for mmc

Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi