diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:48:22 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:48:22 +0200 |
commit | bc574e190d3fbed37d724e33a16aee326d6f2ac4 (patch) | |
tree | ecbd7238f1402783f122d2a1a0310bb2cdb1dd9a /arch/arm/plat-omap | |
parent | Linux 3.0-rc5 (diff) | |
parent | Merge branches 'omap4_clockdomain_hwmod_3.1', 'clock_debugfs_a_3.1', 'omap4_c... (diff) | |
parent | Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-a... (diff) | |
download | linux-bc574e190d3fbed37d724e33a16aee326d6f2ac4.tar.xz linux-bc574e190d3fbed37d724e33a16aee326d6f2ac4.zip |
Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel-2