ARM: arm-soc: Merge branch 'next/pm2' into next/pm
authorOlof Johansson <olof@lixom.net>
Thu, 13 Dec 2012 00:10:45 +0000 (16:10 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Dec 2012 00:10:45 +0000 (16:10 -0800)
commit9c7466b217af784280d9fc841bbd559ef3bf33e9
treec21ee243e48912201b4041fbf3f9bd9165603bd8
parent4a76411ea3f1da9032e031f8fff8894b97d141b2
parent48d224d1efec98b0b78e511150b4f5752beceb7c
ARM: arm-soc: Merge branch 'next/pm2' into next/pm

Another smaller branch merged into next/pm before pull request.

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-exynos/common.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c