Merge 4.0-rc3 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/comedi/drivers/adv_pci1710.c
Simple merge

diff --cc drivers/staging/comedi/drivers/comedi_isadma.c
Simple merge