Merge 4.8-rc5 into staging-next

We want the staging fixes in here as well to handle merge issues.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/accel/Kconfig
Simple merge

diff --cc drivers/iio/adc/Kconfig
Simple merge

diff --cc drivers/iio/chemical/atlas-ph-sensor.c
Simple merge

diff --cc drivers/iio/humidity/Kconfig
Simple merge

diff --cc drivers/iio/light/Kconfig
Simple merge

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

diff --cc drivers/staging/lustre/lustre/llite/namei.c
Simple merge

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