Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai

diff --cc include/sound/pcm.h
Simple merge

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge

diff --cc sound/soc/soc-pcm.c
Simple merge