From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2014 21:38:52 +0000 (-0400)
Subject: Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.18-rc1~117
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f86dc4b04dd5292cae3708c16ca6e46dbb5c95fa;p=linux.git

Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC defconfig changes from Arnd Bergmann:
 "This is a collection of the various changes to defconfig files, most
  importantly enabling some additional platforms in the
  multi_v7_defconfig file"

* tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
  ARM: configs: fix duplicate entry in multi_v7
  ARM: multi_v7_defconfig: add missing Tegra options
  ARM: bcm2835: enable USB_DWC2_HOST in defconfig
  ARM: meson: update multi_v7_defconfig
  ARM: multi_v7_defconfig: Enable Mediatek platform
  ARM: qcom: Update defconfig
  ARM: mvebu: add gpio-fan to mvebu_v7_defconfig
  ARM: mvebu: add LED class support built-in in mvebu_v7_defconfig
  ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
  ARM: LPC32xx: defconfig update
  ARM: configs: Enable cpufreq-cpu0 for multi_v7_defconfig
  ARM: configs: Remove REGULATOR_VIRTUAL_CONSUMER from defconfigs
  ARM: tegra: enable Atmel touchpad in defconfig
  ARM: at91: sama5: update defconfig
  ARM: at91: at91sam9rl: update defconfig
  ARM: at91: at91sam9g45: update defconfig
  ARM: at91: at91sam9263: update defconfig
  ARM: at91: at91sam9261_9g10: update defconfig
  ARM: at91: at91sam9260_9g20: update defconfig
  ARM: at91: at91_dt: update defconfig
  ...
---

f86dc4b04dd5292cae3708c16ca6e46dbb5c95fa
diff --cc arch/arm/configs/multi_v7_defconfig
index 691117bc7e2b,f5a30ca195da..491b7d5523bf
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -28,8 -28,8 +28,9 @@@ CONFIG_ARCH_HIGHBANK=
  CONFIG_ARCH_HISI=y
  CONFIG_ARCH_HI3xxx=y
  CONFIG_ARCH_HIX5HD2=y
 +CONFIG_ARCH_HIP04=y
  CONFIG_ARCH_KEYSTONE=y
+ CONFIG_ARCH_MESON=y
  CONFIG_ARCH_MXC=y
  CONFIG_SOC_IMX51=y
  CONFIG_SOC_IMX53=y
diff --cc arch/arm/configs/sama5_defconfig
index 12007282b557,96c15b775d57..c9089c927daf
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@@ -19,10 -19,8 +19,9 @@@ CONFIG_MODULE_FORCE_UNLOAD=
  CONFIG_ARCH_AT91=y
  CONFIG_SOC_SAM_V7=y
  CONFIG_SOC_SAMA5D3=y
 +CONFIG_SOC_SAMA5D4=y
  CONFIG_MACH_SAMA5_DT=y
  CONFIG_AEABI=y
- # CONFIG_OABI_COMPAT is not set
  CONFIG_UACCESS_WITH_MEMCPY=y
  CONFIG_ZBOOT_ROM_TEXT=0x0
  CONFIG_ZBOOT_ROM_BSS=0x0