From: Rafael J. Wysocki Date: Sat, 27 Apr 2013 23:54:00 +0000 (+0200) Subject: Merge branch 'acpi-pm' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=34bdb1a458baaf3e56843c36deb04283c26a8099;p=linux.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