From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 4 Apr 2013 15:41:10 +0000 (+0200)
Subject: Merge branch 'pm-fixes' into fixes
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6cb437acd93a01fdbd6bac9c78ac8159c644e576;p=~shefty%2Frdma-dev.git

Merge branch 'pm-fixes' into fixes

* pm-fixes:
  cpufreq: Correct header guards typo
  cpufreq: check OF node /cpus presence before dereferencing it
  PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset
  PM / QoS: Avoid possible deadlock related to sysfs access
  USB / PM: Don't try to hide PM QoS flags from usb_port_device_release()
---

6cb437acd93a01fdbd6bac9c78ac8159c644e576