]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'asoc-atmel' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 16 Oct 2012 05:12:32 +0000 (14:12 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 16 Oct 2012 05:12:32 +0000 (14:12 +0900)

Trivial merge