tree d0de7369247689f009c2e0f3fb3bd121555efce1
parent 535e0c1726bec699a8f0f5b86fe7d399546b2555
parent ce6c3997c2fce74d12e6d8887a1d8cdf024fa850
author Linus Torvalds <torvalds@linux-foundation.org> 1252187484 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252187484 -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] Re-enable cpufreq suspend and resume code