Merge remote-tracking branch 'asoc/topic/io' into asoc-next

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

diff --cc sound/soc/codecs/88pm860x-codec.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc sound/soc/codecs/wm5110.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/wm8711.c
Simple merge

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

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

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

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

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

diff --cc sound/soc/codecs/wm8804.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/wm8961.c
Simple merge

diff --cc sound/soc/codecs/wm8962.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/wm8983.c
Simple merge

diff --cc sound/soc/codecs/wm8985.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/wm8995.c
Simple merge

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

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

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

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