Merge 5.11-rc5 into char-misc-next

author Greg Kroah-Hartman <[email protected]>

Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)

committer Greg Kroah-Hartman <[email protected]>

Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)
author Greg Kroah-Hartman <[email protected]>
Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)
committer Greg Kroah-Hartman <[email protected]>
Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/misc/cardreader/rtsx_pcr.c
Simple merge
author	Greg Kroah-Hartman <[email protected]>
	Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)
committer	Greg Kroah-Hartman <[email protected]>
	Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/cardreader/rtsx_pcr.c	patch \|	diff1 \|	diff2 \|	blob \| history