Merge remote-tracking branch 'pm/linux-next'

Conflicts:
	drivers/i2c/i2c-core.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/i2c/i2c-core.c
index 111b2c6089e65b7e82718fc80f8da7143bd3b307,75ba8608383e4b1d26e65a389f099f7028e7b733..5923cfa390c86de6528559c229ace0a4b39b402c
--- 1/drivers/i2c/i2c-core.c
--- 2/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@@ -254,10 -254,13 +254,12 @@@ static int i2c_device_probe(struct devi
                                        client->flags & I2C_CLIENT_WAKE);
        dev_dbg(dev, "probe\n");
  
+       acpi_dev_pm_attach(&client->dev, true);
        status = driver->probe(client, i2c_match_id(driver->id_table, client));
-       if (status)
+       if (status) {
 -              client->driver = NULL;
                i2c_set_clientdata(client, NULL);
- 
+               acpi_dev_pm_detach(&client->dev, true);
+       }
        return status;
  }
  
@@@ -278,9 -281,11 +280,9 @@@ static int i2c_device_remove(struct dev
                dev->driver = NULL;
                status = 0;
        }
 -      if (status == 0) {
 -              client->driver = NULL;
 +      if (status == 0)
                i2c_set_clientdata(client, NULL);
- 
 -      }
+       acpi_dev_pm_detach(&client->dev, true);
        return status;
  }
  

diff --cc drivers/pci/hotplug/acpi_pcihp.c
Simple merge

diff --cc drivers/platform/x86/sony-laptop.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge