ARM: arm-soc: Merge branch 'next/clk' into next/pm
authorOlof Johansson <olof@lixom.net>
Thu, 13 Dec 2012 00:09:22 +0000 (16:09 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Dec 2012 00:10:00 +0000 (16:10 -0800)
commit4a76411ea3f1da9032e031f8fff8894b97d141b2
tree59976175d70b6e08aacd4abf7090919d3b78fc29
parent5c1af2a7011bf719807de360cb64c2f610269a38
parentfb6842a7bc44bf719bfe85d5819a153d7c215510
ARM: arm-soc: Merge branch 'next/clk' into next/pm

Merge together a couple of the smaller pm/clock branches into one.

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_phy_internal.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/pm44xx.c
arch/arm/mach-omap2/twl-common.c
drivers/mmc/host/omap_hsmmc.c