Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/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
  ...

diff --cc arch/arm/configs/multi_v7_defconfig
index 4863cdc3fb95e39ef1629e6b719f3e4fc0dbf00f,28b572a3e6c6aaef5f637bf5d4e161be557df6c0..d4e8a47a2f7c8a016b8eee0adaf36e24bb0c341a
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/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 2ffba3d7b5a5e91e4b661d0c03a303a0b7cca4b6,62b6a37626c5062e78a66a1f78b88857b68ba9fc..a34713d8db9f6cc633d14230808e634e9c4b599b
--- 1/arch/arm/configs/mvebu_defconfig
--- 2/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

diff --cc arch/arm/configs/tegra_defconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-bockw.c
Simple merge