]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.5' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 19 Apr 2012 13:10:28 +0000 (14:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 19 Apr 2012 13:10:28 +0000 (14:10 +0100)

Trivial merge