From: Arnd Bergmann Date: Mon, 29 Apr 2013 15:26:36 +0000 (+0200) Subject: Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup X-Git-Tag: upstream/snapshot3+hdmi~5160^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b45e0ed41adee52c49c222e752495d69d7e57981;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup From Nicolas Ferre : DT modifications for generic slave DMA binding. Addition of MCI and I2C DMA bindings. A little DT machine compatibility removal for SAMA5. * tag 'at91-soc' of git://github.com/at91linux/linux-at91: ARM: at91/sama5d34ek.dts: remove not needed compatibility string ARM: at91: dts: add MCI DMA support ARM: at91: dts: add i2c dma support ARM: at91: dts: set #dma-cells to the correct value Signed-off-by: Arnd Bergmann --- b45e0ed41adee52c49c222e752495d69d7e57981