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)
1  2 
include/sound/pcm.h
include/sound/soc.h
sound/soc/fsl/fsl_ssi.c
sound/soc/soc-pcm.c

Simple merge
Simple merge
Simple merge
Simple merge