]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.4' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Apr 2012 19:20:42 +0000 (20:20 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Apr 2012 19:20:42 +0000 (20:20 +0100)

Trivial merge