Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 11:00:09 +0000 (13:00 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 11:00:09 +0000 (13:00 +0200)
commitf73548c4c8b5ea798792237e327d27633b7740dc
treeaa066a513e43dec99d5c5c907fc66199d4b52e16
parent0f6b9ee4a0f5dc329ff80fae14baa2cf82a8f385
parent908ab9368866e6edf0edebdd546adefd5f3128f9
Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git./linux/kernel/git/swarren/linux-tegra into next/dt

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: tegra: DT-related fixes needed by the MMC tree

In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.

* tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

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