Merge tag 'v3.13-rc5' into next/boards

Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.

Linux 3.13-rc5

diff --combined arch/arm/configs/exynos_defconfig
index aec8a3e,ad7dfbb..dbe1f1c
--- 1/arch/arm/configs/exynos_defconfig
--- 2/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -13,7 -13,7 +13,7 @@@ CONFIG_S3C24XX_PWM=
  CONFIG_ARCH_EXYNOS5=y
  CONFIG_MACH_EXYNOS4_DT=y
  CONFIG_SMP=y
 -CONFIG_NR_CPUS=2
 +CONFIG_NR_CPUS=8
  CONFIG_PREEMPT=y
  CONFIG_AEABI=y
  CONFIG_HIGHMEM=y
@@@ -79,6 -79,6 +79,7 @@@ CONFIG_REGULATOR_FIXED_VOLTAGE=
  CONFIG_REGULATOR_GPIO=y
  CONFIG_REGULATOR_MAX8997=y
  CONFIG_REGULATOR_MAX77686=y
++CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
  CONFIG_REGULATOR_TPS65090=y
  CONFIG_FB=y

diff --combined arch/arm/mach-omap2/omap_device.c
index 828f538,e0a398c..01ef59d
--- 1/arch/arm/mach-omap2/omap_device.c
--- 2/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@@ -36,7 -36,6 +36,7 @@@
  #include <linux/of.h>
  #include <linux/notifier.h>
  
 +#include "common.h"
  #include "soc.h"
  #include "omap_device.h"
  #include "omap_hwmod.h"
@@@ -184,6 -183,10 +184,10 @@@ static int omap_device_build_from_dt(st
  odbfd_exit1:
        kfree(hwmods);
  odbfd_exit:
+       /* if data/we are at fault.. load up a fail handler */
+       if (ret)
+               pdev->dev.pm_domain = &omap_device_fail_pm_domain;
+ 
        return ret;
  }
  
@@@ -201,7 -204,6 +205,7 @@@ static int _omap_device_notifier_call(s
        case BUS_NOTIFY_ADD_DEVICE:
                if (pdev->dev.of_node)
                        omap_device_build_from_dt(pdev);
 +              omap_auxdata_legacy_init(dev);
                /* fall through */
        default:
                od = to_omap_device(pdev);
@@@ -606,6 -608,19 +610,19 @@@ static int _od_runtime_resume(struct de
  
        return pm_generic_runtime_resume(dev);
  }
+ 
+ static int _od_fail_runtime_suspend(struct device *dev)
+ {
+       dev_warn(dev, "%s: FIXME: missing hwmod/omap_dev info\n", __func__);
+       return -ENODEV;
+ }
+ 
+ static int _od_fail_runtime_resume(struct device *dev)
+ {
+       dev_warn(dev, "%s: FIXME: missing hwmod/omap_dev info\n", __func__);
+       return -ENODEV;
+ }
+ 
  #endif
  
  #ifdef CONFIG_SUSPEND
@@@ -659,6 -674,13 +676,13 @@@ static int _od_resume_noirq(struct devi
  #define _od_resume_noirq NULL
  #endif
  
+ struct dev_pm_domain omap_device_fail_pm_domain = {
+       .ops = {
+               SET_RUNTIME_PM_OPS(_od_fail_runtime_suspend,
+                                  _od_fail_runtime_resume, NULL)
+       }
+ };
+ 
  struct dev_pm_domain omap_device_pm_domain = {
        .ops = {
                SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,