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)
commita36b32402a805033beed752ea85c5ed62586fe35
tree10cfb5c2f9f16cd9c8c9c8d49cad4186f0d65bd2
parent23af7b0bba404325755d35bfff64307fa23071e1
parent7f08a89862b96d84c6dfe6c242eb010084e51d3b
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next
sound/soc/soc-dapm.c