From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Apr 2010 18:35:21 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
X-Git-Tag: v3.0~5123
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e