]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 5.6-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:37:48 +0000 (08:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:37:48 +0000 (08:37 +0100)
commit15fa89a3f95eb29cf0594a7b9db3b22289eb9632
tree4b27357fa550be86fde495ea9c9b2bdb54ebe1d7
parente0d7a72af9c857ac54203e20eb02b83c23739a38
parent218d2ac1a4bfbb8ed3c4e9a719c4de27a9bf80db
Merge 5.6-rc3 into staging-next

We need the staging fixes in here, and it resolves a merge issue in the
MAINTAINERS file.

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