From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Apr 2014 21:44:13 +0000 (-0700)
Subject: Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.15-rc1~78
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=930b440cd8256f3861bdb0a59d26efaadac7941a;p=pandora-kernel.git

Merge tag 'boards-3.15' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC board changes from Arnd Bergmann:
 "As we continue to replace board files with device tree descriptions,
  this part of the ARM support is getting smaller.  We have basically
  just defconfig changes here this time, and a significant number of
  Renesas shmobile changes, as Renesas is still in the process of
  deprecating board file support"

* tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
  ARM: enable fhandle in multi_v7_defconfig
  ARM: tegra: enable fhandle in tegra_defconfig
  ARM: update multi_v7_defconfig for Tegra
  ARM: add Marvell Dove and some drivers to multi_v7 defconfig
  ARM: fix duplicate symbols in multi_v5_defconfig
  ARM: pxa: add gpio keys information
  ARM: tegra: defconfig updates
  ARM: config: keystone: enable AEMIF/NAND support
  ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig
  ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
  ARM: config: Add mvebu_v5_defconfig
  ARM: config: Add a multi_v5_defconfig
  ARM: shmobile: r7s72100: update defconfig for I2C usage
  ARM: shmobile: Remove Lager DT reference legacy clock bits
  ARM: shmobile: Remove Koelsch DT reference legacy clock bits
  ARM: shmobile: Remove KZM9D board code
  ARM: mvebu: update defconfigs for Armada 375 and 38x
  ARM: dove: Enable watchdog support in the defconfig
  ARM: mvebu: Enable watchdog support in defconfig
  ARM: config: keystone: enable led support
  ...
---

930b440cd8256f3861bdb0a59d26efaadac7941a
diff --cc arch/arm/configs/multi_v7_defconfig
index 4863cdc3fb95,28b572a3e6c6..d4e8a47a2f7c
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -9,9 -10,11 +10,12 @@@ CONFIG_MODULE_UNLOAD=
  CONFIG_PARTITION_ADVANCED=y
  CONFIG_ARCH_MVEBU=y
  CONFIG_MACH_ARMADA_370=y
+ CONFIG_MACH_ARMADA_375=y
+ CONFIG_MACH_ARMADA_38X=y
  CONFIG_MACH_ARMADA_XP=y
+ CONFIG_MACH_DOVE=y
  CONFIG_ARCH_BCM=y
 +CONFIG_ARCH_BCM_5301X=y
  CONFIG_ARCH_BCM_MOBILE=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_MACH_BERLIN_BG2=y
diff --cc arch/arm/configs/mvebu_v7_defconfig
index 2ffba3d7b5a5,62b6a37626c5..a34713d8db9f
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@@ -10,8 -10,9 +10,10 @@@ CONFIG_MODULES=
  CONFIG_MODULE_UNLOAD=y
  CONFIG_ARCH_MVEBU=y
  CONFIG_MACH_ARMADA_370=y
+ CONFIG_MACH_ARMADA_375=y
+ CONFIG_MACH_ARMADA_38X=y
  CONFIG_MACH_ARMADA_XP=y
 +CONFIG_NEON=y
  # CONFIG_CACHE_L2X0 is not set
  # CONFIG_SWP_EMULATE is not set
  CONFIG_PCI=y