Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai
authorMark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:57 +0000 (12:42 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:57 +0000 (12:42 +0000)
commit2f43a23ab9ea1865a663e100b0af20198decb4f1
tree7501fb678115cbbdb544c43dc7b59f95408f1f52
parent7cfa7b547337faf5890c8c5f091e081fb79caf73
parent55dcdb5051930dee75e9e2c0da90bc82ee3dcd77
Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai
include/sound/pcm.h
include/sound/soc.h
sound/soc/fsl/fsl_ssi.c
sound/soc/soc-pcm.c