]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit754b7ade7f7be2f34b7f5acbd3fa26d02dc83ad5
tree59976175d70b6e08aacd4abf7090919d3b78fc29
parentd2cb7084fe31400dff5fe017594bdbb9e1a444b0
parentea602edebdb96d892ad00e9a7e65bd44e62a9c23
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