From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 7 Aug 2013 20:55:38 +0000 (+0200)
Subject: Merge branch 'pm-fixes'
X-Git-Tag: v3.11-rc5~11^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69fdadfd2200e0bf3d10a7a7925db8e9fc5a46fd;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pm-fixes'

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

69fdadfd2200e0bf3d10a7a7925db8e9fc5a46fd