Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
authorKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 15:21:17 +0000 (08:21 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 18 Oct 2013 15:21:28 +0000 (08:21 -0700)
commitaf43ef6770560103dc10daa9caa31688e4ed7e4c
treee7309a26077910faa4ec5b10b9b1f0a2f589d365
parentec902c620b31de13fa5afb2803af175793a7273d
parente483341ce82750a1b526b65b7178213dcf967a7a
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 <khilman@linaro.org>