Merge branch 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 13 Mar 2012 23:20:12 +0000 (16:20 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Mar 2012 23:20:12 +0000 (16:20 -0700)
* 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
  mmc: sdhci-s3c: add platform data for the second capability
  ARM: SAMSUNG: support the second capability for samsung-soc


Trivial merge