tree e28d67d3872dce2516c039ccad08fabff076cead
parent 8e500ff8df1223dfb42d6c39d3de1fc216fba1a2
parent fd187aaf980c45f1d16a94a846faa68e24de03c8
author Linus Torvalds <torvalds@linux-foundation.org> 1272134121 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1272134121 -0700

Merge branch 'fixes' of git://git.kernel.org/pub/scm/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