Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/fsl', 'asoc/topic/gpio...

diff --cc sound/soc/codecs/rt5677.c
Simple merge

diff --cc sound/soc/codecs/wm5100.c
Simple merge

diff --cc sound/soc/codecs/wm8903.c
Simple merge

diff --cc sound/soc/codecs/wm8962.c
Simple merge

diff --cc sound/soc/codecs/wm8996.c
Simple merge