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)
commitf3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6
tree25d034a3afd0aba5f4d96531be6faf217afa9886
parent04cc7bc61c666eb090b51dc5d058b209d01d03be
parentf5cca86448af2d6af67808bfbde7dc1ed170f469
Merge branch 'next/devel-samsung-mmc' of git://git./linux/kernel/git/kgene/linux-samsung into next/drivers

* '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