Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 14:07:58 +0000 (14:07 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 14:07:58 +0000 (14:07 +0000)
1  2 
sound/soc/soc-dapm.c

Simple merge