]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 21 Mar 2013 20:38:36 +0000 (21:38 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 21 Mar 2013 20:38:36 +0000 (21:38 +0100)
1  2 
sound/soc/soc-dapm.c

Simple merge