ARM: arm-soc: Merge branch 'next/pm2' into next/pm

Another smaller branch merged into next/pm before pull request.

Signed-off-by: Olof Johansson <[email protected]>

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index d6700d3ddd042cde1b36ec1dedc344f9c2db498e,219fb075741bbb492d0bc5089df5701ed5de751e..ce1661d18e56d956b91c4a78b3f0ea518b7ac33c
--- 1/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -21,11 -21,11 +21,12 @@@
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.h>
 +#include <linux/platform_data/omap_ocp2scp.h>
  #include <linux/i2c-omap.h>
  
- #include <plat-omap/dma-omap.h>
+ #include <linux/omap-dma.h>
  
+ #include <linux/platform_data/omap_ocp2scp.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include <plat/dmtimer.h>