]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'for-3.6' and 'for-3.7' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Aug 2012 17:06:43 +0000 (18:06 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Aug 2012 17:06:43 +0000 (18:06 +0100)

Trivial merge