Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jul 2009 03:59:13 +0000 (20:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jul 2009 03:59:13 +0000 (20:59 -0700)
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix compile failure in cpufreq.c


Trivial merge