Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc sound/soc/intel/boards/skl_nau88l25_ssm4567.c
Simple merge

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

diff --cc sound/soc/jz4740/jz4740-i2s.c
Simple merge

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

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

diff --cc sound/soc/sof/intel/hda-stream.c
Simple merge