Merge 5.12-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Mar 2021 06:52:17 +0000 (07:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Mar 2021 06:52:17 +0000 (07:52 +0100)
commitb828324bba8f575fde487a91fec07303789dda8a
tree12b7d509d6bbb3657a87f1226b4eb593bfd5772d
parent0ba8b68b5b30ad3cba7ed8b6323ff6a127017ff4
parent1e28eed17697bcf343c6743f0028cc3b5dd88bf0
Merge 5.12-rc3 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/r8192U_wx.c
drivers/staging/wfx/sta.c