From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 29 Nov 2012 20:46:48 +0000 (+0100)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: v3.8-rc1~182^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=170bb4c800d2b65df52f37400fb20276273650d8;p=~emulex%2Finfiniband.git

Merge branch 'pm-sleep'

* pm-sleep:
  PM / Freezer: Fixup compile error of try_to_freeze_nowarn()
  driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device
  PM / Hibernate: use rb_entry
  PM / sysfs: replace strict_str* with kstrto*
---

170bb4c800d2b65df52f37400fb20276273650d8