Merge 5.5-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jan 2020 06:52:17 +0000 (07:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jan 2020 06:52:17 +0000 (07:52 +0100)
commitd40310f65771b3a1eb9af34af433136887a64251
treeaca0913593f44daee3845d72cca5bbd827b39012
parente895bc1ebb31750f3baa74e074617d3cc5d0cee2
parentb3a987b0264d3ddbb24293ebff10eddfc472f653
Merge 5.5-rc6 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/vt6656/baseband.c
drivers/staging/vt6656/device.h
drivers/staging/vt6656/main_usb.c