Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', 'asoc/topic...

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

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

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

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