Merge tag 'v5.13-rc6' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jun 2021 07:12:45 +0000 (09:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jun 2021 07:12:45 +0000 (09:12 +0200)
We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

diff --cc MAINTAINERS
Simple merge