From: Olof Johansson <olof@lixom.net>
Date: Sun, 29 Dec 2013 05:37:03 +0000 (-0800)
Subject: Merge tag 'v3.13-rc5' into next/boards
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fe5a365cdb9cc925d5ce86a5bb4509dca57f3894;p=deliverable%2Flinux.git

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

fe5a365cdb9cc925d5ce86a5bb4509dca57f3894
diff --cc arch/arm/configs/exynos_defconfig
index aec8a3ea1436,ad7dfbbafa45..dbe1f1c47bb0
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -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