From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 03:22:01 +0000 (-0700)
Subject: Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Tag: v3.2-rc1~95
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd9a0b6bd67ec372b0ef3cb2abe26974f888b956;p=profile%2Fivi%2Fkernel-x86-ivi.git

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)
---

cd9a0b6bd67ec372b0ef3cb2abe26974f888b956
diff --cc arch/arm/mach-omap2/pm.c
index 25b8c7f,d34fc52..0844e2e
--- a/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;
  	}