Merge 3.17-rc6 into staging-next.

We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/accel/bma180.c
index 6ef19641457c4cf09d9c554bf109c687ebc5751c,19100fddd2edb7e8c11f367ae4061346fcd10089..f081b007f7d2bf7a3cdae95754b10efad7ca57e8
--- 1/drivers/iio/accel/bma180.c
--- 2/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@@ -729,31 -553,29 +729,31 @@@ static int bma180_probe(struct i2c_clie
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &bma180_info;
  
 -      trig = iio_trigger_alloc("%s-dev%d", indio_dev->name, indio_dev->id);
 -      if (!trig) {
 -              ret = -ENOMEM;
 -              goto err_chip_disable;
 -      }
 +      if (client->irq > 0) {
 +              data->trig = iio_trigger_alloc("%s-dev%d", indio_dev->name,
 +                      indio_dev->id);
 +              if (!data->trig) {
 +                      ret = -ENOMEM;
 +                      goto err_chip_disable;
 +              }
  
 -      ret = devm_request_irq(&client->dev, client->irq,
 -                      iio_trigger_generic_data_rdy_poll,
 -                      IRQF_TRIGGER_RISING, BMA180_IRQ_NAME, trig);
 -      if (ret) {
 -              dev_err(&client->dev, "unable to request IRQ\n");
 -              goto err_trigger_free;
 -      }
 +              ret = devm_request_irq(&client->dev, client->irq,
 +                      iio_trigger_generic_data_rdy_poll, IRQF_TRIGGER_RISING,
 +                      "bma180_event", data->trig);
 +              if (ret) {
 +                      dev_err(&client->dev, "unable to request IRQ\n");
 +                      goto err_trigger_free;
 +              }
  
 -      trig->dev.parent = &client->dev;
 -      trig->ops = &bma180_trigger_ops;
 -      iio_trigger_set_drvdata(trig, indio_dev);
 -      data->trig = trig;
 -      indio_dev->trig = iio_trigger_get(trig);
 +              data->trig->dev.parent = &client->dev;
 +              data->trig->ops = &bma180_trigger_ops;
 +              iio_trigger_set_drvdata(data->trig, indio_dev);
-               indio_dev->trig = data->trig;
++              indio_dev->trig = iio_trigger_get(trig);
  
 -      ret = iio_trigger_register(trig);
 -      if (ret)
 -              goto err_trigger_free;
 +              ret = iio_trigger_register(data->trig);
 +              if (ret)
 +                      goto err_trigger_free;
 +      }
  
        ret = iio_triggered_buffer_setup(indio_dev, NULL,
                        bma180_trigger_handler, NULL);

diff --cc drivers/iio/adc/at91_adc.c
Simple merge

diff --cc drivers/iio/adc/xilinx-xadc-core.c
Simple merge

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