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

author Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 18:15:46 +0000 (19:15 +0100)

committer Mark Brown <broonie@linaro.org>

Thu, 17 Oct 2013 18:15:46 +0000 (19:15 +0100)
author Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 18:15:46 +0000 (19:15 +0100)
committer Mark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 18:15:46 +0000 (19:15 +0100)
diff --cc Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
Simple merge
author	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 18:15:46 +0000 (19:15 +0100)
committer	Mark Brown <broonie@linaro.org>
	Thu, 17 Oct 2013 18:15:46 +0000 (19:15 +0100)