Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:01:42 +0000 (14:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:01:42 +0000 (14:01 -0800)
commitcfd80652467717ca7346857d6d8c94503d74f3a3
treeff4264e19c7b73b78fe45470830d4d4bd1442c0d
parent687530b44de7e0fe70fabb4200d4cabce3af1a0c
parent1f858ef2fbabdc5e645644010a31a40c32e397c9
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] pcc-cpufreq: don't load driver if get_freq fails during init.