Merge branch 'samsung/driver' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 00:18:56 +0000 (00:18 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 28 Dec 2011 00:18:56 +0000 (00:18 +0000)
commita46117836e23f97cf4660b0ebf8404ad151fb63d
tree2739f48d6ba3a7a8820f54929778ab69db314dba
parentbd4b9ba4cf9338932a065cd752fb5f28b26e4e39
parent155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511
Merge branch 'samsung/driver' into next/drivers

* samsung/driver:
  ARM: EXYNOS: Modified files for SPI consolidation work
  ARM: S5P64X0: Enable SDHCI support
  ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
  ARM: S5P64X0: Add HSMMC setup for host Controller
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/include/mach/map.h