Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
authorMark Brown <broonie@kernel.org>
Sat, 5 Mar 2016 12:26:28 +0000 (21:26 +0900)
committerMark Brown <broonie@kernel.org>
Sat, 5 Mar 2016 12:26:28 +0000 (21:26 +0900)
1  2 
sound/soc/soc-dapm.c

Simple merge