Merge 5.12-rc6 into staging-next

author Greg Kroah-Hartman <[email protected]>

Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)

committer Greg Kroah-Hartman <[email protected]>

Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
author Greg Kroah-Hartman <[email protected]>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
committer Greg Kroah-Hartman <[email protected]>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/staging/rtl8192e/rtllib_rx.c
Simple merge
author	Greg Kroah-Hartman <[email protected]>
	Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
committer	Greg Kroah-Hartman <[email protected]>
	Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/rtllib_rx.c	patch \|	diff1 \|	diff2 \|	blob \| history