Merge 5.0-rc4 into staging-next

We need 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/android/ion/ion.c
Simple merge

diff --cc drivers/staging/rtl8188eu/os_dep/usb_intf.c
Simple merge

diff --cc drivers/staging/wilc1000/host_interface.c
Simple merge

diff --cc drivers/staging/wilc1000/wilc_wlan.c
Simple merge