From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 9 Feb 2015 22:45:27 +0000 (+0100)
Subject: Merge back earlier 'pm-tools' material for v3.20
X-Git-Tag: v4.0-rc1~143^2^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e840b41031acdbb7cd60fce7c67f46f9025d8df1;p=linux.git

Merge back earlier 'pm-tools' material for v3.20
---

e840b41031acdbb7cd60fce7c67f46f9025d8df1