diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 01:18:56 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 01:18:56 +0100 |
commit | a46117836e23f97cf4660b0ebf8404ad151fb63d (patch) | |
tree | 2739f48d6ba3a7a8820f54929778ab69db314dba /arch/arm/mach-omap2/board-omap3logic.c | |
parent | Merge branch 'samsung/cleanup' into next/drivers (diff) | |
parent | Merge branch 'next-samsung-devel-mmc-spi5' of git://git.kernel.org/pub/scm/li... (diff) | |
download | linux-a46117836e23f97cf4660b0ebf8404ad151fb63d.tar.xz linux-a46117836e23f97cf4660b0ebf8404ad151fb63d.zip |
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
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
0 files changed, 0 insertions, 0 deletions