Merge branch 'sdmmc-dra-linux-3.8.y' of git://git.ti.com/~balajitk/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Tue, 4 Jun 2013 13:53:37 +0000 (08:53 -0500)
committerDan Murphy <dmurphy@ti.com>
Tue, 4 Jun 2013 13:53:37 +0000 (08:53 -0500)
commitbce1e92e23ff58828c7c05c67ccd1dfa7e21e5cb
tree7b96bd2a0096a7d2e578542f7aa94cd06cd3c74a
parent54d80897fd69e30702f3b6f115d77d37ad78f9ef
parent187e1156a292085f23cef2b8407a439f34a3f11d
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 the sdma dt node and corresponding dma request lines for mmc

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