Merge branch 'topic/asoc' into for-next

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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