]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d77ce6 413541d)
Merge tag 'v3.13-rc5' into next/boards
authorOlof Johansson <olof@lixom.net>
Sun, 29 Dec 2013 05:37:03 +0000 (21:37 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 29 Dec 2013 05:38:16 +0000 (21:38 -0800)
Need a newer base version to get a regulator fix for Samsung platforms that
they enable building in a defconfig.

Linux 3.13-rc5

1  2 
arch/arm/configs/exynos_defconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_device.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/exynos_defconfig
index aec8a3ea14365d1ead3c9d189426c616fc07ab7d,ad7dfbbafa453422fc5c986e2f749d3eaf609a0c..dbe1f1c47bb0defeb03635030fe9ec0f3ba8a42e
--- 1/arch/arm/configs/exynos_defconfig
--- 2/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
diff --cc arch/arm/mach-omap2/omap_device.c
Simple merge
Andy's Linux Kernel repo