summary refs log tree commit diff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 19:52:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 19:52:16 +0100
commit69bad361e69ac0e9f96865f405439e7cbd8c0136 (patch)
treef8133d3e8e426a2f730d85a41c287f1b7965e622 /drivers/i2c
parent1b07db3178ba11e7e64a4d04e3dd57c8e2ceeb3f (diff)
parent40e7fcb19293cbdff02c74cb0668413480f82ea1 (diff)
parentc52fa70c79acbb1d4868fee244a638d6ee6f5aab (diff)
parentbb32baf76e56cdb348633f4d789a93e81b975c47 (diff)
parent6fd8050a35475259c444afc6856d57f4bbd74231 (diff)
downloadlinux-69bad361e69ac0e9f96865f405439e7cbd8c0136.tar.gz
Merge branches 'acpi-scan', 'acpi-pm', 'acpi-lpss' and 'acpi-processor'
* acpi-scan:
  ACPI: Add _DEP support to fix battery issue on Asus T100TA

* acpi-pm:
  ACPI / sleep: Drain outstanding events after disabling multiple GPEs
  ACPI / PM: Fixed a typo in a comment

* acpi-lpss:
  dmaengine: dw: enable runtime PM
  ACPI / LPSS: introduce a 'proxy' device to power on LPSS for DMA
  ACPI / LPSS: allow to use specific PM domain during ->probe()
  ACPI / LPSS: add all LPSS devices to the specific power domain

* acpi-processor:
  ACPI / cpuidle: avoid assigning signed errno to acpi_status
  ACPI / processor: remove unused variabled from acpi_processor_power structure
  ACPI / processor: Update the comments in processor.h