Merge 4.0-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Apr 2015 09:03:02 +0000 (11:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Apr 2015 09:03:02 +0000 (11:03 +0200)
commitc610f7f772aa06ae2bd8e5ace87cde4d90f70198
tree6991a32acd3d63685c184734869877707fa73d1c
parentf9541f8239a5765595543b021b2dce6a8d6653ab
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1
Merge 4.0-rc7 into staging-next

We want those fixes (iio primarily) into the -next branch to help with
merge and testing issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/accel/bmc150-accel.c
drivers/iio/accel/kxcjk-1013.c
drivers/iio/adc/Kconfig
drivers/iio/adc/vf610_adc.c
drivers/iio/gyro/bmg160.c
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
drivers/iio/imu/kmx61.c
drivers/iio/proximity/sx9500.c