Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Apr 2010 18:35:21 +0000 (11:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Apr 2010 18:35:21 +0000 (11:35 -0700)
commitddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e
treee28d67d3872dce2516c039ccad08fabff076cead
parent8e500ff8df1223dfb42d6c39d3de1fc216fba1a2
parentfd187aaf980c45f1d16a94a846faa68e24de03c8
Merge branch 'fixes' of git://git./linux/kernel/git/davej/cpufreq

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] use max load in conservative governor
  [CPUFREQ] fix a lockdep warning