Merge branch 'heads/pm-for-v4.1' into next

diff --cc arch/arm/mach-shmobile/Makefile
index 9e9d6788de512d319e1f6eb39247659718c202c6,0ae702b0d45b700a111eeee26754c25d76139518..56554e0dd3bab26185be2a0ad41bedcee5c2e5c2
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -49,7 -50,11 +49,8 @@@ obj-$(CONFIG_CPU_IDLE)               += cpuidle.
  obj-$(CONFIG_CPU_FREQ)                += cpufreq.o
  obj-$(CONFIG_PM_RCAR)         += pm-rcar.o
  obj-$(CONFIG_PM_RMOBILE)      += pm-rmobile.o
+ obj-$(CONFIG_ARCH_RCAR_GEN2)  += pm-rcar-gen2.o
  
 -# special sh7372 handling for IRQ objects and low level sleep code
 -obj-$(CONFIG_ARCH_SH7372)     += entry-intc.o sleep-sh7372.o
 -
  # Board objects
  ifdef CONFIG_ARCH_SHMOBILE_MULTI
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen-reference.o

diff --cc arch/arm/mach-shmobile/smp-r8a7790.c
Simple merge

diff --cc arch/arm/mach-shmobile/smp-r8a7791.c
Simple merge