Merge branch 'for_3.4/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc arch/arm/mach-omap2/pm34xx.c
index 238defc,6aeacf6..703bd10
--- 1/arch/arm/mach-omap2/pm34xx.c
--- 2/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@@ -739,11 -820,11 +737,11 @@@ static int __init omap3_pm_init(void
  
        ret = pwrdm_for_each(pwrdms_setup, NULL);
        if (ret) {
-               printk(KERN_ERR "Failed to setup powerdomains\n");
-               goto err2;
+               pr_err("Failed to setup powerdomains\n");
+               goto err3;
        }
  
 -      (void) clkdm_for_each(clkdms_setup, NULL);
 +      (void) clkdm_for_each(omap_pm_clkdms_setup, NULL);
  
        mpu_pwrdm = pwrdm_lookup("mpu_pwrdm");
        if (mpu_pwrdm == NULL) {

diff --cc arch/arm/mach-omap2/pm44xx.c
Simple merge

diff --cc arch/arm/mach-omap2/prm_common.c
Simple merge