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

1  2 
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/include/mach/map.h

Simple merge
Simple merge