Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
authorArnd Bergmann <arnd@arndb.de>
Wed, 26 Jun 2013 14:55:36 +0000 (16:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 26 Jun 2013 14:56:24 +0000 (16:56 +0200)
commit9686bb66a4c50e43ffee903a9fc62237ee2de1e6
tree89fa21b387f64e6027c0bddd7783899813dca7f6
parentf7bea65be78ca165c6b44f28497ae6f5dfc7db26
parent26e3326cc04bc3fc890a95ad6cb36359372acba5
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:

- more SPI DT activation for rm9200
- SPI DMA for at91sam9n12/sama5d3
And one little fix for SPI compatibility string

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string

Conflicts:
arch/arm/boot/dts/sama5d3.dtsi

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/at91rm9200.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/sama5d3.dtsi