summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 01:34:00 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 01:34:00 +0300
commitf303906d4d5c22cdffe309807e2e21d9b8ff9a91 (patch)
tree119b2a52fa008dcc5ba45cba8ef7fc2ea66127eb /drivers/acpi
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff)
parent7b02ccea2e70e5e3e9fccf36123b77240323b8d6 (diff)
parent359597cb374b7935bf804cde590ac55f9cb275b7 (diff)
parent7b1a13228b321ea27bd53070bcd332417069ace8 (diff)
downloadlinux-f303906d4d5c22cdffe309807e2e21d9b8ff9a91.tar.xz
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