From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 20 May 2014 11:22:15 +0000 (+0200)
Subject: Merge branch 'pm-sleep' into acpi-pm
X-Git-Tag: v3.16-rc1~30^2^2~2^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=55cc33ceb75643d190ed215f423972e0b7ae7aeb;p=~emulex%2Finfiniband.git

Merge branch 'pm-sleep' into acpi-pm
---

55cc33ceb75643d190ed215f423972e0b7ae7aeb