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)
commit10abe843d5f08793fb684eaef3739f3c26635e42
tree1d1eec1a55f780f3170a3f04515d4629934766d8
parent07797e9bb67f801c04d47b323f631ff16bf2bc7e
parent863ebddec85c5ce2fb2e7742e8834a3bd69a2512
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
include/sound/soc-dai.h
sound/soc/mxs/mxs-saif.c