]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'for-3.4' and 'for-3.5' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 17 Apr 2012 20:02:43 +0000 (21:02 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 17 Apr 2012 20:02:43 +0000 (21:02 +0100)
1  2  3 
sound/soc/soc-core.c

Simple merge