From: Olof Johansson Date: Tue, 13 Mar 2012 23:20:12 +0000 (-0700) Subject: Merge branch 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.4-rc1~73^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6;p=karo-tx-linux.git Merge branch 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/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 --- f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6