Merge 4.3-rc7 into staging-next

We want the other staging patches in this branch as well.

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/staging/iio/accel/sca3000_ring.c
Simple merge

diff --cc drivers/staging/iio/adc/mxs-lradc.c
Simple merge

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