From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 19:35:27 +0000 (+0100)
Subject: Merge branch 'late/mvebu-dt' into for-next
X-Git-Tag: next-20130220~18^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8fd52f810614258e57a46546b4b03ca57290ff93;p=karo-tx-linux.git

Merge branch 'late/mvebu-dt' into for-next

* late/mvebu-dt: (36 commits)
  arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
  ARM: kirkwood: topkick: init mvsdio via DT
  ARM: kirkwood: nsa310: convert to pinctrl
  ARM: Kirkwood: topkick: Enable i2c bus.
  ARM: kirkwood: topkick: convert to pinctrl
  ARM: dove: convert serial DT nodes to clocks property
  arm: mvebu: Add SPI flash on Armada 370 DB board
  arm: mvebu: Add SPI flash on Armada XP-DB board
  arm: mvebu: Add SPI flash on Armada XP-GP board
  arm: mvebu: Add support for SPI controller in Armada 370/XP
  clocksource: update and move armada-370-xp-timer documentation to timer directory
  arm: mvebu: update DT to support local timers
  ARM: Dove: convert usb host controller to DT
  arm: mvebu: Enable USB controllers on Armada 370/XP boards
  arm: mvebu: Add support for USB host controllers in Armada 370/XP
  arm: mvebu: add button for OpenBlocks AX3-4
  ARM: Kirkwood: Convert NS2 to gpio-poweroff.
  ARM: Kirkwood: Convert NSA310 I2C to device tree
  ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
  ARM: Kirkwood: Convert NSA310 to DT based regulators.
  ...

Conflicts:
	arch/arm/mach-kirkwood/board-nsa310.c
---

8fd52f810614258e57a46546b4b03ca57290ff93