Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Oct 2013 00:17:49 +0000 (01:17 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Oct 2013 00:17:49 +0000 (01:17 +0100)
commitdd6c26be3bb3e98d4811780f831bbc246dae54c8
tree5b0cce644ee725386b2c4539afc91459e1913cd9
parentc0ced86d38f418448dce1ca8a825dfd16ee9a23a
parent33cf00e5708290f7e57d949219ef443a2aef34e0
Merge branch 'acpi-pm'

* acpi-pm:
  spi: attach/detach SPI device to the ACPI power domain
  i2c: attach/detach I2C client device to the ACPI power domain
  ACPI / PM: allow child devices to ignore parent power state
drivers/acpi/device_pm.c
drivers/i2c/i2c-core.c
include/acpi/acpi_bus.h