]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-fixes' into fixes-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 2 Apr 2013 13:32:34 +0000 (15:32 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 2 Apr 2013 13:32:34 +0000 (15:32 +0200)
* 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()


Trivial merge