Merge branch 'pm-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 7 Aug 2013 20:55:38 +0000 (22:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 7 Aug 2013 20:55:38 +0000 (22:55 +0200)
* pm-fixes:
  cpufreq: rename ignore_nice as ignore_nice_load
  cpufreq: loongson2: fix regression related to clock management


Trivial merge