From: Rafael J. Wysocki Date: Fri, 6 Jun 2014 22:17:50 +0000 (+0200) Subject: Merge branch 'acpi-pm' into pm-sleep X-Git-Tag: v3.16-rc1~30^2^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3eba148d75670f61463dd3c9ef8672da8f290f36;p=linux.git Merge branch 'acpi-pm' into pm-sleep --- 3eba148d75670f61463dd3c9ef8672da8f290f36