From: Kevin Hilman Date: Fri, 18 Oct 2013 15:21:17 +0000 (-0700) 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=af43ef6770560103dc10daa9caa31688e4ed7e4c;p=linux-beck.git Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt From Nicolas Ferre: First DT series for 3.13 - addition of sound for at91sam9n12 - a little fix for MMC vs. SPI on at91sam9g20ek * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek ARM: at91: add sound support on at91sam9n12ek board ARM: at91: enable ssc on at91sam9n12ek board ARM: at91: enable wm8904 on at91sam9n12ek board ARM: at91: add ssc dma parameter for at91sam9n12 ARM: at91: add at91sam9n12 ssc clock in look up table Signed-off-by: Kevin Hilman --- af43ef6770560103dc10daa9caa31688e4ed7e4c