Merge remote-tracking branch 'asoc/fix/adsp' into asoc-adsp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 28 Jan 2013 16:51:05 +0000 (00:51 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 28 Jan 2013 16:51:05 +0000 (00:51 +0800)
commit06dc374c70fd75fb3f81a4c1f6586d7c5b8e3833
treec14018309adcae62979c2f73c4197a16280a923e
parent7480800ea682b70b0a15cda00eed7eedc90ceb9c
parent2d30b5751d3fdcc589985929ffb3969520f6c828
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-adsp

Conflicts:
sound/soc/codecs/wm_adsp.c
sound/soc/codecs/wm_adsp.c