]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-pm', 'acpi-scan', 'acpi-enumeration' and 'acpi-sysfs' into linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 7 Apr 2015 11:52:47 +0000 (13:52 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 7 Apr 2015 11:52:47 +0000 (13:52 +0200)
* acpi-pm:
  ACPI / PM: Enable all wakeup GPEs in suspend-to-idle
  ACPI / sleep: Drop acpi_suspend() which is not used

* acpi-scan:
  ACPI / scan: fix fixed event handler return value

* acpi-enumeration:
  ACPI: Add acpi_device_uid() for convenience
  ACPI: Update GPIO documentation to mention _DSD

* acpi-sysfs:
  ACPI / sysfs: Treat the count field of counter_show() as unsigned


Trivial merge