From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 26 Jun 2013 14:55:36 +0000 (+0200)
Subject: Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~69^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9686bb66a4c50e43ffee903a9fc62237ee2de1e6;p=pandora-kernel.git

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>
---

9686bb66a4c50e43ffee903a9fc62237ee2de1e6
Reading git-diff-tree failed