Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc

* 'next/pm' of git://git.linaro.org/people/arnd/arm-soc: (66 commits)
  ARM: CSR: PM: use outer_resume to resume L2 cache
  ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII
  ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM=n
  ARM: CSR: PM: add sleep entry for SiRFprimaII
  ARM: CSR: PM: save/restore irq status in suspend cycle
  ARM: CSR: PM: save/restore timer status in suspend cycle
  OMAP4: PM: TWL6030: add cmd register
  OMAP4: PM: TWL6030: fix ON/RET/OFF voltages
  OMAP4: PM: TWL6030: address 0V conversions
  OMAP4: PM: TWL6030: fix uv to voltage for >0x39
  OMAP4: PM: TWL6030: fix voltage conversion formula
  omap: voltage: add a stub header file for external/regulator use
  OMAP2+: VC: more registers are per-channel starting with OMAP5
  OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale
  OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage
  OMAP3+: voltdm: final removal of omap_vdd_info
  OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain
  OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix
  OMAP3+: VP: combine setting init voltage into common function
  OMAP3+: VP: remove unused omap_vp_get_curr_volt()
  ...

Fix up trivial conflict in arch/arm/mach-prima2/l2x0.c (code removal vs
edit)

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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

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

diff --cc arch/arm/mach-omap2/pm.c
index 25b8c7f43852cbd5af4cd39586b8d66af40137a5,d34fc5206b4a18989a034be273c9ac18a9b663c1..0844e2ecfb4ab56c7330cec33e6dbeb526bdf223
--- 1/arch/arm/mach-omap2/pm.c
--- 2/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@@ -181,9 -181,9 +181,9 @@@ static int __init omap2_set_init_voltag
                goto exit;
        }
  
-       voltdm = omap_voltage_domain_lookup(vdd_name);
+       voltdm = voltdm_lookup(vdd_name);
        if (IS_ERR(voltdm)) {
 -              printk(KERN_ERR "%s: Unable to get vdd pointer for vdd_%s\n",
 +              pr_err("%s: unable to get vdd pointer for vdd_%s\n",
                        __func__, vdd_name);
                goto exit;
        }

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

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

diff --cc arch/arm/mach-prima2/timer.c
Simple merge