From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Aug 2014 18:35:11 +0000 (-0700)
Subject: Merge tag 'defconfig-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v4.14-rc1~7061
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a44e68ca0a8456ed33c62c99b8c42bebdcbbc8c;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'defconfig-for-3.17' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC defconfig updates from Olof Johansson:
 "We broke this out in a separate branch since some defconfigs now are
  shared between maintainers, and having them merged in through separate
  topics (drivers/soc/etc) is a recipe for conflicts.

  Most of this is removal of two defconfigs:

   - Kirkwood, now folded into mvebu/multi_v5
   - Renesas genmai, removed platform
   - major defconfig refresh for exynos
   - various updates on the other multi-defconfigs and others (tegra,
     socfpga, shmobile):

* tag 'defconfig-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: multi_v7_defconfig: Enable TI PIPE3 PHY driver
  ARM: config: enable ARCH_HIX5HD2
  ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY
  ARM: multi_v7_defconfig: Enable ST's (S)ATA driver
  ARM: multi_v7_defconfig: add ST Keyscan driver
  ARM: update multi_v7_defconfig for STI
  ARM: multi_v7_defconfig: Configure in ST's Thermal Controller
  ARM: exynos_defconfig: Update exynos_defconfig
  ARM: shmobile: defconfig: Remove MACH_GENMAI
  ARM: mvebu: update mvebu_v7_defconfig with cpufreq support
  ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig
  ARM: shmobile: genmai: remove defconfig
  ARM: socfpga: Update socfpga_defconfig
  ARM: Kirkwood: Remove kirkwood_defconfig
  ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig
  ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig
  ARM: mvebu: add devtmpfs to mvebu_v5_defconfig
  ARM: mvebu: add appended DTB support in mvebu_v5_defconfig
  ARM: multi_v7: enable igb, stmpe, lm95245, pwm leds
  ARM: multi_v7_defconfig: Enable ST's I2C driver
  ...
---

0a44e68ca0a8456ed33c62c99b8c42bebdcbbc8c
diff --cc arch/arm/configs/multi_v7_defconfig
index 3332a42,a0bdb23..5fb95fb
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -25,10 -24,12 +25,12 @@@ CONFIG_MACH_BERLIN_BG2=
  CONFIG_MACH_BERLIN_BG2CD=y
  CONFIG_MACH_BERLIN_BG2Q=y
  CONFIG_ARCH_HIGHBANK=y
+ CONFIG_ARCH_HISI=y
  CONFIG_ARCH_HI3xxx=y
+ CONFIG_ARCH_HIX5HD2=y
  CONFIG_ARCH_KEYSTONE=y
  CONFIG_ARCH_MXC=y
 -CONFIG_MACH_IMX51_DT=y
 +CONFIG_SOC_IMX51=y
  CONFIG_SOC_IMX53=y
  CONFIG_SOC_IMX6Q=y
  CONFIG_SOC_IMX6SL=y