Merge 3.16-rc2 into staging-next

We want the staging fixes here as well.

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/staging/comedi/Kconfig
Simple merge

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