Merge 4.9-rc5 into staging-next

We want the staging/iio fixes in here as well to resolve issues and
merge problems.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/accel/st_accel_core.c
Simple merge

diff --cc drivers/iio/common/hid-sensors/hid-sensor-attributes.c
Simple merge

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

diff --cc drivers/staging/greybus/arche-platform.c
Simple merge

diff --cc drivers/staging/media/bcm2048/radio-bcm2048.c
Simple merge