Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Aug 2009 22:28:46 +0000 (15:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Aug 2009 22:28:46 +0000 (15:28 -0700)
commit3f5760b90eb3bacfaa4d4c3e584152468ed327ca
tree5d142091d4bec3aee9650ffe564d75bb348fd6ee
parent624720e09c9b7913ef4bc6989878a6fcb7ecdff8
parent4bc5d34135039566b8d6efa2de7515b2be505da8
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] Make cpufreq suspend code conditional on powerpc.
  [CPUFREQ] Fix a kobject reference bug related to managed CPUs
  [CPUFREQ] Do not set policy for offline cpus
  [CPUFREQ] Fix NULL pointer dereference regression in conservative governor