git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0ced86 33cf00e)
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)
* 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

1  2 
drivers/acpi/device_pm.c patch | diff1 | diff2 | blob | history
drivers/i2c/i2c-core.c patch | diff1 | diff2 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/device_pm.c
Simple merge
diff --cc drivers/i2c/i2c-core.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.