Merge 4.5-rc3 into staging-next

We want the upstream staging fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/iio/dac/mcp4725.c
index fb4b3364d8e09da93e945905c9bd4ff5e723f980,b4dde8315210c6519c7e2a7db4bd8bf3b6607988..cca935c06f2b6fbac5fd85763fc85c1bc99e37ed
--- 1/drivers/iio/dac/mcp4725.c
--- 2/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@@ -346,8 -300,9 +346,9 @@@ static int mcp4725_probe(struct i2c_cli
        data->client = client;
  
        indio_dev->dev.parent = &client->dev;
+       indio_dev->name = id->name;
        indio_dev->info = &mcp4725_info;
 -      indio_dev->channels = &mcp4725_channel;
 +      indio_dev->channels = &mcp472x_channel[id->driver_data];
        indio_dev->num_channels = 1;
        indio_dev->modes = INDIO_DIRECT_MODE;
  

diff --cc drivers/iio/humidity/dht11.c
index 96185f8fad88fab9be3989c21e04aca2c80e3c79,cfc5a051ab9f3946bfdfd4aaf5aaac01f7245f36..20b500da94db3f5914cd7e0e2c1118f2a47ec979
--- 1/drivers/iio/humidity/dht11.c
--- 2/drivers/iio/humidity/dht11.c
+++ b/drivers/iio/humidity/dht11.c
@@@ -177,12 -161,12 +177,12 @@@ static int dht11_read_raw(struct iio_de
                        int *val, int *val2, long m)
  {
        struct dht11 *dht11 = iio_priv(iio_dev);
 -      int ret, timeres;
 +      int ret, timeres, offset;
  
        mutex_lock(&dht11->lock);
-       if (dht11->timestamp + DHT11_DATA_VALID_TIME < ktime_get_real_ns()) {
+       if (dht11->timestamp + DHT11_DATA_VALID_TIME < ktime_get_boot_ns()) {
                timeres = ktime_get_resolution_ns();
 -              if (DHT11_DATA_BIT_HIGH < 2 * timeres) {
 +              if (timeres > DHT11_MIN_TIMERES) {
                        dev_err(dht11->dev, "timeresolution %dns too low\n",
                                timeres);
                        /* In theory a better clock could become available

diff --cc drivers/iio/pressure/mpl115.c
Simple merge