Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:25 +0000 (14:28 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:25 +0000 (14:28 +0100)
1  2 
include/sound/soc.h
sound/soc/soc-core.c

Simple merge
Simple merge