]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 May 2013 22:38:09 +0000 (17:38 -0500)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 May 2013 22:38:09 +0000 (17:38 -0500)

Trivial merge