Merge branch 'next/drivers' into late/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 21:12:42 +0000 (23:12 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 21:12:42 +0000 (23:12 +0200)
commit22cf644e03419b4c3d002109b021c7482306f0bf
treedb426bcf5d4f7acfdbcaa5276b87d12cbb061fa1
parent31880c37c11e28cb81c70757e38392b42e695dc6
parentdb60074b468c5935760bd1f33cd192fae3c28b2b
Merge branch 'next/drivers' into late/multiplatform

Multiple parts of next/drivers are prerequisites for the final
exynos multiplatform changes, so let's pull in the entire branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h
arch/arm/mach-omap2/timer.c
drivers/clk/tegra/clk-tegra20.c