Merge 4.1-rc4 into staging-next

We want the fixes in here for testing and merge issues.

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

diff --cc drivers/iio/accel/mma9551_core.c
Simple merge

diff --cc drivers/iio/accel/mma9553.c
Simple merge

diff --cc drivers/iio/common/st_sensors/st_sensors_core.c
Simple merge

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

diff --cc drivers/staging/sm750fb/sm750.c
Simple merge

diff --cc drivers/staging/vt6655/device_main.c
Simple merge