From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 12 Apr 2015 22:34:00 +0000 (+0200)
Subject: Merge branches 'acpi-pm', 'acpi-enumeration' and 'acpi-sysfs'
X-Git-Tag: v4.1-rc1~131^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f303906d4d5c22cdffe309807e2e21d9b8ff9a91;p=linux.git

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
---

f303906d4d5c22cdffe309807e2e21d9b8ff9a91