Merge 5.11-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jan 2021 10:13:59 +0000 (11:13 +0100)
commit66afbe4d633a0fc74f409a051296c3db22bea0b1
tree266af16a50a13a5de6e5106477bde9c9f999377d
parentf6f1f8e6e3eea25f539105d48166e91f0ab46dd1
parent6ee1d745b7c9fd573fba142a2efdad76a9f1cb04
Merge 5.11-rc5 into char-misc-next

We need the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/misc/cardreader/rtsx_pcr.c