tree 4be320cfd8cabafe10d2177d8e2d70178300f16e
parent 0034102808e0dbbf3a2394b82b1bb40b5778de9e
parent b3431f5ba402a98a89b78a9408b4972d8870df4d
author Olof Johansson <olof@lixom.net> 1334513369 -0700
committer Olof Johansson <olof@lixom.net> 1334513369 -0700

Merge branch 'omap/dt-missed-3.4' into next/dt

* omap/dt-missed-3.4:
  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