Merge branch 'for-linus' into topic/virmidi

author Takashi Iwai <[email protected]>

Sun, 29 Jul 2018 20:38:54 +0000 (22:38 +0200)

committer Takashi Iwai <[email protected]>

Sun, 29 Jul 2018 20:39:29 +0000 (22:39 +0200)
author Takashi Iwai <[email protected]>
Sun, 29 Jul 2018 20:38:54 +0000 (22:38 +0200)
committer Takashi Iwai <[email protected]>
Sun, 29 Jul 2018 20:39:29 +0000 (22:39 +0200)
diff --cc sound/pci/hda/patch_conexant.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
author	Takashi Iwai <[email protected]>
	Sun, 29 Jul 2018 20:38:54 +0000 (22:38 +0200)
committer	Takashi Iwai <[email protected]>
	Sun, 29 Jul 2018 20:39:29 +0000 (22:39 +0200)
		1	2
sound/pci/hda/patch_conexant.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history