Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:32 +0000 (10:43 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:32 +0000 (10:43 +0000)
commit5ac452772f41b266a5959c5a7eac756ed8f5fdad
tree4deb5133ecbf92595f54b594f556046efaa84b9c
parent672922e975106b2a57cf3f4ba68405e4e5e700cc
parent863ebddec85c5ce2fb2e7742e8834a3bd69a2512
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
include/sound/soc-dai.h
sound/soc/mxs/mxs-saif.c