OSDN Git Service

Merge 4.2-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jul 2015 20:21:28 +0000 (13:21 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jul 2015 20:21:28 +0000 (13:21 -0700)
commited15e8880fc3d8d52bc02a02521054bfcb26264a
tree816a7f35028762976f5d4bc4df172e407c4bcbe2
parentb8d1f261fe7e4967593a5637d62991b6197a03f8
parent52721d9d3334c1cb1f76219a161084094ec634dc
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
drivers/iio/accel/bmc150-accel.c
drivers/iio/adc/Kconfig
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
drivers/iio/light/Kconfig
drivers/iio/light/cm3323.c
drivers/iio/light/ltr501.c
drivers/iio/light/tcs3414.c
drivers/iio/temperature/tmp006.c
drivers/staging/vt6655/device_main.c