]> 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>
Thu, 9 Aug 2012 18:44:21 +0000 (19:44 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 18:44:21 +0000 (19:44 +0100)
1  2  3 
sound/soc/soc-core.c

Simple merge