Merge 4.1-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 May 2015 20:52:44 +0000 (13:52 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 May 2015 20:52:44 +0000 (13:52 -0700)
commit936a0cd52aa5d024c583e36e2f21bf6ec2e527e4
tree01cffc11361be7d671b71ba86463f6649b39d552
parent36bf51acc89d113f101e40f40af4ab53fbf5b60a
parente26081808edadfd257c6c9d81014e3b25e9a6118
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>
drivers/iio/accel/mma9551_core.c
drivers/iio/accel/mma9553.c
drivers/iio/common/st_sensors/st_sensors_core.c
drivers/iio/magnetometer/st_magn_core.c
drivers/staging/sm750fb/sm750.c
drivers/staging/vt6655/device_main.c