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)
commit69fdadfd2200e0bf3d10a7a7925db8e9fc5a46fd
tree1a07df06d5b269dd45d943e7f98bf06e5a3419d6
parent5ba1aef5e5eab1ad61a4a870a606ff7ab8a574d5
parent6c4640c3adfd97ce10efed7c07405f52d002b9a8
Merge branch 'pm-fixes'

* pm-fixes:
  cpufreq: rename ignore_nice as ignore_nice_load
  cpufreq: loongson2: fix regression related to clock management