Merge 4.7-rc6 into staging-next

We want the staging fixes in here as well.

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

diff --cc .mailmap
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/adc/ad7266.c
Simple merge

diff --cc drivers/staging/iio/accel/sca3000_core.c
Simple merge