Merge 4.2-rc4 into staging-next

We want the iio and other fixes in this branch as well.

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

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

diff --cc drivers/iio/temperature/mlx90614.c
Simple merge