OSDN Git Service

Merge branches 'acpi-pm', 'acpi-enumeration' and 'acpi-sysfs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Apr 2015 22:34:00 +0000 (00:34 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Apr 2015 22:34:00 +0000 (00:34 +0200)
commitf303906d4d5c22cdffe309807e2e21d9b8ff9a91
tree119b2a52fa008dcc5ba45cba8ef7fc2ea66127eb
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76
parent7b02ccea2e70e5e3e9fccf36123b77240323b8d6
parent359597cb374b7935bf804cde590ac55f9cb275b7
parent7b1a13228b321ea27bd53070bcd332417069ace8
Merge branches 'acpi-pm', 'acpi-enumeration' and 'acpi-sysfs'

* acpi-pm:
  ACPI / PM: Enable all wakeup GPEs in suspend-to-idle
  ACPI / sleep: Drop acpi_suspend() which is not used

* 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