diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 16:20:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 16:20:12 -0700 |
| commit | f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6 (patch) | |
| tree | 25d034a3afd0aba5f4d96531be6faf217afa9886 /arch/s390/mm/mmap.c | |
| parent | 04cc7bc61c666eb090b51dc5d058b209d01d03be (diff) | |
| parent | f5cca86448af2d6af67808bfbde7dc1ed170f469 (diff) | |
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
Diffstat (limited to 'arch/s390/mm/mmap.c')
0 files changed, 0 insertions, 0 deletions