From: Olof Johansson <olof@lixom.net>
Date: Sun, 15 Apr 2012 18:29:06 +0000 (-0700)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20120417~5^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0ba45145922f283b30c7f1a4e5da753ae39ec174;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next

* next/dt:
  ARM: imx28: add basic dt support
  arm/dts: OMAP3: Add mmc controller nodes and board data
  arm/dts: OMAP4: Add mmc controller nodes and board data
  arm/dts: twl: Pass regulator data from dt
  arm/dts: omap4-sdp: Add ks8851 ethernet SPI device
  arm/dts: OMAP3: Add SPI controller nodes
  arm/dts: OMAP4: Add SPI controller nodes
  arm/dts: OMAP3: Add gpio nodes
  arm/dts: OMAP4: Add gpio nodes
  ARM: OMAP2+: board-generic: Remove i2c static init
  arm/dts: omap3-beagle: Add twl4030 and i2c EEPROM
  arm/dts: omap4-sdp: Add twl6030, i2c3 and i2c4 devices
  arm/dts: omap4-panda: Add twl6030 and i2c EEPROM
  arm/dts: twl4030: Add DTS file for twl4030 PM + Audio IC
  arm/dts: twl6030: Add DTS file for twl6030 PMIC
---

0ba45145922f283b30c7f1a4e5da753ae39ec174
diff --cc arch/arm/arm-soc-for-next-contents.txt
index c76feea11b16,000000000000..5f1c325708f1
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,9 -1,0 +1,13 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +It also includes a couple of directly applied patches for build breaks with subject
 +The next/* branches are kept in the order in which they get applied.
 +
 +next/cleanup:
 +ixp2xxx/removal		git://sources.calxeda.com/kernel/linux.git ixp2xxx-removal
++
++next/dt:
++omap/dt-missed-3.4:	git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.4/dts/all
++mxs/dt:			git://git.linaro.org/people/shawnguo/linux-2.6.git mxs/dt