Merge branch 'pm-fixes' into fixes
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 4 Apr 2013 15:41:10 +0000 (17:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 4 Apr 2013 15:41:10 +0000 (17:41 +0200)
commit6cb437acd93a01fdbd6bac9c78ac8159c644e576
treedcea21b85b8beb7fc4ac12420cea34f4307507e3
parentfc1a7fe8b6442a941a8af0cdcc9ff6b666707d60
parentbeb0ff390e208e71668a1389e3db02631a88cff5
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()