Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc arch/arm/mach-omap2/Makefile
index fa742f3,f8ee10a..f74e975
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -65,13 -64,14 +65,14 @@@ endi
  ifeq ($(CONFIG_PM),y)
  obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o
  obj-$(CONFIG_ARCH_OMAP2)              += sleep24xx.o
 -obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o \
 -                                         cpuidle34xx.o
 -obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o omap-mpuss-lowpower.o \
 -                                         cpuidle44xx.o
 +obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o
 +obj-$(CONFIG_ARCH_OMAP3)              += cpuidle34xx.o
 +obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o omap-mpuss-lowpower.o
 +obj-$(CONFIG_ARCH_OMAP4)              += cpuidle44xx.o
  obj-$(CONFIG_PM_DEBUG)                        += pm-debug.o
- obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
- obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o
+ 
+ obj-$(CONFIG_POWER_AVS_OMAP)          += sr_device.o
+ obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
  
  AFLAGS_sleep24xx.o                    :=-Wa,-march=armv6
  AFLAGS_sleep34xx.o                    :=-Wa,-march=armv7-a$(plus_sec)

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

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

diff --cc drivers/power/Kconfig
Simple merge