Merge 3.12-rc4 into staging-next

We want the staging fixes in this branch as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/industrialio-core.c
Simple merge

diff --cc drivers/iio/magnetometer/st_magn_core.c
Simple merge