Merge 5.5-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Dec 2019 12:00:09 +0000 (07:00 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Dec 2019 12:00:09 +0000 (07:00 -0500)
commit398d999f96bf8e02573b0c7e32896c7812393bc0
tree839f1616cc205b9a74f07f7b571a603814446de6
parenta5a98554206651b25d84a25b49eeac31dffbe358
parent46cf053efec6a3a5f343fead837777efe8252a46
Merge 5.5-rc3 into staging-next

We need the staging fixes in here as well.

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