Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:24:09 +0000 (11:24 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:24:09 +0000 (11:24 +0100)
1  2 
include/sound/soc-dai.h
sound/soc/mxs/mxs-saif.c

Simple merge
Simple merge