]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-pm-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Oct 2013 23:43:42 +0000 (01:43 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Oct 2013 23:43:42 +0000 (01:43 +0200)
* acpi-pm-next:
  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

1  2 
drivers/i2c/i2c-core.c

Simple merge