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

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

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

diff --cc sound/soc/intel/byt-max98090.c
Simple merge

diff --cc sound/soc/intel/sst-haswell-dsp.c
Simple merge