From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Jun 2014 23:21:41 +0000 (-0700)
Subject: Merge tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c67d9ce1668735a22762251e96b3fd31bb289867;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'boards-for-3.16' of git://git./linux/kernel/git/arm/arm-soc into next

Pull ARM SoC board support updates from Olof Johansson:
 "The bulk of this branch is updates for Renesas Shmobile.  They are
  still doing some enablement for classic boards first, and then come up
  with DT bindings when they've had a chance to learn more about the
  hardware.  Not necessarily a bad way to go about it, and they're
  looking at moving some of the temporary board code resulting from it
  to drivers/staging instead to avoid the churn here.

  As a result of the shmobile clock cleanups, we end up merging quite a
  bit of SH code here as well.  We ended up merging it here instead of
  in the cleanup branch due to the other board changes depending on it"

* tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (130 commits)
  ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL
  ARM: add drivers for Colibri T30 to multi_v7_defconfig
  ARM: shmobile: Remove Genmai reference DTS
  ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
  ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
  ARM: shmobile: genmai-reference: Remove legacy clock support
  ARM: shmobile: Remove non-multiplatform Genmai reference support
  ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
  ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP
  ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01
  ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH
  ARM: OMAP: remove some dead code
  ARM: OMAP: omap3stalker: remove two Kconfig macros
  ARM: tegra: tegra_defconfig updates
  ARM: shmobile: r7s72100: use workaround for non DT-clocks
  ARM: shmobile: Add forward declaration of struct clk to silence warning
  ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add spi clocks to dtsi
  ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add i2c clocks to dtsi
  ...
---

c67d9ce1668735a22762251e96b3fd31bb289867
diff --cc arch/arm/boot/dts/Makefile
index ff7a04b68d88,a3a279d618d4..1ae42ed4b919
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -302,8 -297,8 +302,7 @@@ dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
  	s3c6410-smdk6410.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 -	r7s72100-genmai.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
- 	r7s72100-genmai-reference.dtb \
  	r8a7740-armadillo800eva.dtb \
  	r8a7778-bockw.dtb \
  	r8a7778-bockw-reference.dtb \