Merge branch 'asoc-5.2' into asoc-linus

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

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

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

diff --cc sound/soc/codecs/nau8825.h
Simple merge

diff --cc sound/soc/intel/skylake/skl.c
Simple merge

diff --cc sound/soc/intel/skylake/skl.h
Simple merge

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

diff --cc sound/soc/ti/davinci-mcasp.c
Simple merge

diff --cc sound/soc/ti/omap-mcbsp.c
Simple merge