git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 20 Jul 2015 20:21:28 +0000 (13:21 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 20 Jul 2015 20:21:28 +0000 (13:21 -0700)
commit	ed15e8880fc3d8d52bc02a02521054bfcb26264a
tree	816a7f35028762976f5d4bc4df172e407c4bcbe2	tree \| snapshot (tar.gz zip)
parent	b8d1f261fe7e4967593a5637d62991b6197a03f8	commit \| diff
parent	52721d9d3334c1cb1f76219a161084094ec634dc	commit \| diff

Merge 4.2-rc3 into staging-next

We need the staging fixes in here as well.

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

Documentation/ABI/testing/sysfs-bus-iio	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/bmc150-accel.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/cm3323.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/ltr501.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/tcs3414.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/temperature/tmp006.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6655/device_main.c	diff1 \|	diff2 \|	blob \| history