From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 27 Apr 2013 23:54:00 +0000 (+0200)
Subject: Merge branch 'acpi-pm'
X-Git-Tag: firefly_0821_release~3680^2~504^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=34bdb1a458baaf3e56843c36deb04283c26a8099;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Expose lists of device wakeup power resources to user space
  ACPI / PM: Fix potential problem in acpi_device_get_power()
---

34bdb1a458baaf3e56843c36deb04283c26a8099