Merge branch 'for-linus' into for-next

author Takashi Iwai <[email protected]>

Mon, 30 Aug 2021 06:04:04 +0000 (08:04 +0200)

committer Takashi Iwai <[email protected]>

Mon, 30 Aug 2021 06:04:04 +0000 (08:04 +0200)
author Takashi Iwai <[email protected]>
Mon, 30 Aug 2021 06:04:04 +0000 (08:04 +0200)
committer Takashi Iwai <[email protected]>
Mon, 30 Aug 2021 06:04:04 +0000 (08:04 +0200)
diff --cc sound/usb/card.c
Simple merge
diff --cc sound/usb/endpoint.c
Simple merge
diff --cc sound/usb/usbaudio.h
Simple merge
author	Takashi Iwai <[email protected]>
	Mon, 30 Aug 2021 06:04:04 +0000 (08:04 +0200)
committer	Takashi Iwai <[email protected]>
	Mon, 30 Aug 2021 06:04:04 +0000 (08:04 +0200)
		1	2
sound/usb/card.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/endpoint.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbaudio.h	patch \|	diff1 \|	diff2 \|	blob \| history