Merge 5.12-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
commite5c7bccc3775b49cd7006331826aa90cb76c1992
tree4d50d9afdb83ebd9ca37a24042ca6dda45d281db
parent507614ba25ffedcc53f24ca6686c877ff1e2e694
parente49d033bddf5b565044e2abe4241353959bc9120
Merge 5.12-rc6 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/rtl8192e/rtllib_rx.c