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>

diff --cc Documentation/ABI/testing/sysfs-bus-iio
Simple merge

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

diff --cc drivers/iio/adc/Kconfig
index dace593b158b49a1c4bc913332b0333ecb519ef1,eb0cd897714a26b619b9e6c924ce4c3a65a5806b..233d47b7dea84b1d93f9ff0d704bd9be2a1f8775
--- 1/drivers/iio/adc/Kconfig
--- 2/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@@ -158,13 -151,9 +158,12 @@@ config DA9150_GPAD
          This driver can also be built as a module. If chosen, the module name
          will be da9150-gpadc.
  
 +        To compile this driver as a module, choose M here: the module will be
 +        called berlin2-adc.
 +
  config CC10001_ADC
        tristate "Cosmic Circuits 10001 ADC driver"
-       depends on HAVE_CLK || REGULATOR
-       depends on HAS_IOMEM
+       depends on HAS_IOMEM && HAVE_CLK && REGULATOR
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help

diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
Simple merge

diff --cc drivers/iio/light/Kconfig
Simple merge

diff --cc drivers/iio/light/cm3323.c
Simple merge

diff --cc drivers/iio/light/ltr501.c
Simple merge

diff --cc drivers/iio/light/tcs3414.c
Simple merge

diff --cc drivers/iio/temperature/tmp006.c
Simple merge

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