Merge remote-tracking branches 'asoc/topic/const', 'asoc/topic/cs35l32', 'asoc/topic...

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

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

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

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

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

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

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

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

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