Merge 4.6-rc7 into staging-next

This fixes some merge issues with some iio drivers that were found in
linux-next.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/iio/adc/at91-sama5d2_adc.c
Simple merge

diff --cc drivers/iio/magnetometer/ak8975.c
index dbf066129a0408a82b0cfc448b1b0b0bbb17ce13,0e931a9a1669424278a1daa935a919e32db32e35..609a2c401b5dcf27e80ad76dbc23d2c4cad99ebf
--- 1/drivers/iio/magnetometer/ak8975.c
--- 2/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@@ -851,13 -732,11 +851,13 @@@ static int ak8975_probe(struct i2c_clie
        int eoc_gpio;
        int err;
        const char *name = NULL;
-       enum asahi_compass_chipset chipset;
+       enum asahi_compass_chipset chipset = AK_MAX_TYPE;
 +      const struct ak8975_platform_data *pdata =
 +              dev_get_platdata(&client->dev);
  
        /* Grab and set up the supplied GPIO. */
 -      if (client->dev.platform_data)
 -              eoc_gpio = *(int *)(client->dev.platform_data);
 +      if (pdata)
 +              eoc_gpio = pdata->eoc_gpio;
        else if (client->dev.of_node)
                eoc_gpio = of_get_gpio(client->dev.of_node, 0);
        else