Merge remote-tracking branch 'asoc/topic/fsl' into tmp

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

diff --cc sound/soc/mxs/mxs-sgtl5000.c
Simple merge

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