Merge remote-tracking branch 'mmc/mmc-next'

author Thierry Reding <treding@nvidia.com>

Mon, 21 Oct 2013 11:29:46 +0000 (13:29 +0200)

committer Thierry Reding <treding@nvidia.com>

Mon, 21 Oct 2013 11:29:46 +0000 (13:29 +0200)
author Thierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:29:46 +0000 (13:29 +0200)
committer Thierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:29:46 +0000 (13:29 +0200)
diff --cc Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
Simple merge
author	Thierry Reding <treding@nvidia.com>
	Mon, 21 Oct 2013 11:29:46 +0000 (13:29 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Mon, 21 Oct 2013 11:29:46 +0000 (13:29 +0200)