Merge branch 'asoc-4.20' into asoc-next

author Mark Brown <broonie@kernel.org>

Sun, 21 Oct 2018 15:59:23 +0000 (16:59 +0100)

committer Mark Brown <broonie@kernel.org>

Sun, 21 Oct 2018 15:59:23 +0000 (16:59 +0100)
author Mark Brown <broonie@kernel.org>
Sun, 21 Oct 2018 15:59:23 +0000 (16:59 +0100)
committer Mark Brown <broonie@kernel.org>
Sun, 21 Oct 2018 15:59:23 +0000 (16:59 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/pci/hda/hda_codec.c
Simple merge
diff --cc sound/pci/hda/hda_intel.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Sun, 21 Oct 2018 15:59:23 +0000 (16:59 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 21 Oct 2018 15:59:23 +0000 (16:59 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history