Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 28 Jun 2013 11:17:05 +0000 (12:17 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 28 Jun 2013 11:17:05 +0000 (12:17 +0100)
1  2 
sound/soc/codecs/wm_adsp.h

Simple merge