Merge branch 'for-linus' into for-next

author Takashi Iwai <[email protected]>

Tue, 2 Feb 2021 17:48:28 +0000 (18:48 +0100)

committer Takashi Iwai <[email protected]>

Tue, 2 Feb 2021 17:48:33 +0000 (18:48 +0100)
author Takashi Iwai <[email protected]>
Tue, 2 Feb 2021 17:48:28 +0000 (18:48 +0100)
committer Takashi Iwai <[email protected]>
Tue, 2 Feb 2021 17:48:33 +0000 (18:48 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/core/pcm_native.c
Simple merge
diff --cc sound/pci/hda/hda_codec.c
Simple merge
author	Takashi Iwai <[email protected]>
	Tue, 2 Feb 2021 17:48:28 +0000 (18:48 +0100)
committer	Takashi Iwai <[email protected]>
	Tue, 2 Feb 2021 17:48:33 +0000 (18:48 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	patch \|	diff1 \|	diff2 \|	blob \| history