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)
commit23f89b12753260463ebe027eed6324be33565010
tree32a7bc808eefb444ffc1f9e49b0325d4cef7c077
parentedc64e7a03c81fcddb1c1a0af253705833d704ad
parent009c9aa5be652675a06d5211e1640e02bbb1c33d
Merge tag 'v5.13-rc6' into staging-next

We want the staging fixes in here as well.

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