Merge 5.8-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2020 10:42:15 +0000 (12:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2020 10:42:15 +0000 (12:42 +0200)
commit908e757daecf2120c3019fa630ae5d4c3cd7165b
tree652b0f3ecd4a6d7c0066169d6ae466711300197c
parent58b1d3f864b1f32521d60642e240face22e9ee68
parent92ed301919932f777713b9172e525674157e983d
Merge 5.8-rc7 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/comedi/drivers/addi_apci_1032.c
drivers/staging/comedi/drivers/addi_apci_1500.c
drivers/staging/comedi/drivers/addi_apci_1564.c
drivers/staging/comedi/drivers/ni_6527.c