From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2015 18:43:59 +0000 (-0700)
Subject: Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.2-rc1~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d9f96d850e4bbfae24dc9aee03033dd77c81596;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'armsoc-dt' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC DT updates from Kevin Hilman:
 "As usual, quite a few device-tree updates in ARM land.  There was one
  minor churn in DTs due to relicensing under a dual-license, and lots
  of little additions of new peripherals, features etc, but nothing
  really exciting to call to your attention.  Some higlights, focsuing
  on support for new SoCs and boards:

   - AT91: new boards: Overkiz,  Acme Systems' Arietta G25
   - tegra: HDA support
   - bcm: new platforms: Buffalo WXR-1900DHP, SmartRG SR400ac, ASUS
     RT-AC87U
   - mvebu: new platforms: Compulab CM-A510, Armada 385-based Linksys
     boards, DLink DNS-327L
   - OMAP: new platforms: Baltos IR5221, LogicPD Torpedo, Toby-Churchill
     SL50
   - ARM: added support for Juno r1 board
   - sunxi: A33 SoC support; new boards: A23 EVB, SinA33, GA10H-A33,
     Mele A1000G
   - imx: i.MX7D SoC support; new boards: Armadeus Systems APF6,
     Gateworks GW5510, and aristainetos2 boards
   - hisilicon: hi6220 SoC support; new boards: 96boards hikey"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (462 commits)
  ARM: hisi: revert changes from hisi/hip04-dt branch
  ARM: nomadik: set proper compatible for accelerometer
  ARM64: juno: add GPIO keys
  ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes
  ARM: dts: Introduce STM32F429 MCU
  ARM: socfpga: dts: enable ethernet for Arria10 devkit
  ARM: dts: k2l: fix the netcp range size
  ARM: dts: k2e: fix the netcp range size
  ARM: dts: k2hk: fix the netcp range size
  ARM: dts: k2l-evm: Add device bindings for netcp driver
  ARM: dts: k2e-evm: Add device bindings for netcp driver
  ARM: dts: k2hk-evm: Add device bindings for netcp driver
  ARM: BCM5301X: Add DT for Asus RT-AC87U
  ARM: BCM5301X: add IRQ numbers for PCIe controller
  ARM: BCM5301X: add NAND flash chip description
  arm64: dts: Add dts files for Hisilicon Hi6220 SoC
  clk: hi6220: Document devicetree bindings for hi6220 clock
  arm64: hi6220: Document devicetree bindings for Hisilicon hi6220 SoC
  ARM: at91/dt: sama5d4ek: mci0 uses slot 0
  ARM: at91/dt: kizbox: fix mismatch LED PWM device
  ...
---

3d9f96d850e4bbfae24dc9aee03033dd77c81596
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index a37ad99,6964913..58d6930
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -52,9 -53,9 +53,10 @@@ cnxt	Conexant Systems, Inc
  cortina	Cortina Systems, Inc.
  cosmic	Cosmic Circuits
  crystalfontz	Crystalfontz America, Inc.
+ cubietech	Cubietech, Ltd.
  dallas	Maxim Integrated Products (formerly Dallas Semiconductor)
  davicom	DAVICOM Semiconductor, Inc.
 +delta	Delta Electronics, Inc.
  denx	Denx Software Engineering
  digi	Digi International Inc.
  digilent	Diglent, Inc.
@@@ -160,9 -164,9 +165,10 @@@ radxa	Radx
  raidsonic	RaidSonic Technology GmbH
  ralink	Mediatek/Ralink Technology Corp.
  ramtron	Ramtron International
+ raspberrypi	Raspberry Pi Foundation
  realtek Realtek Semiconductor Corp.
  renesas	Renesas Electronics Corporation
 +richtek	Richtek Technology Corporation
  ricoh	Ricoh Co. Ltd.
  rockchip	Fuzhou Rockchip Electronics Co., Ltd
  samsung	Samsung Semiconductor