From: Arnd Bergmann Date: Mon, 17 Mar 2014 14:05:35 +0000 (+0100) Subject: Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=542798cdd500614feba234ed602777eae33edbb8;p=linux-beck.git Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre: - activate DMA for NAND flash controller - some binding documentation update for usba and ADC (iio) drivers - removal of some deprecated ADC (iio) properties * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91/dt: at91-cosino: remove useless adc properties ARM: at91/dt: sama5d3: remove useless adc properties ARM: at91/dt: at91sam9x5: remove useless adc properties ARM: at91/dt: at91sam9g45: remove useless adc properties ARM: at91/dt: at91sam9260: remove useless adc properties ARM: at91/dt: at91-ariag25: remove useless adc properties Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt Documentation: dt: iio: improve atmel-adc documentation ARM: at91: sama5d3: get rid of atmel_tsadcc driver ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning ARM: at91/DT: add NAND + DMA property Signed-off-by: Arnd Bergmann --- 542798cdd500614feba234ed602777eae33edbb8