tree 4b27357fa550be86fde495ea9c9b2bdb54ebe1d7
parent f2409865c23ff83e08e07be8fa5d5d9b96f61487
parent f8788d86ab28f61f7b46eb6be375f8a726783636
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1582529868 +0100
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1582529868 +0100

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>