From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 2 Apr 2013 13:32:34 +0000 (+0200)
Subject: Merge branch 'pm-fixes' into fixes-next
X-Git-Tag: next-20130404~78^2~2^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=82489652fa73208ec2e7a59c51c91ff9e7478e29;p=karo-tx-linux.git

Merge branch 'pm-fixes' into fixes-next

* 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()
---

82489652fa73208ec2e7a59c51c91ff9e7478e29