]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:51:24 +0000 (14:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:51:24 +0000 (14:51 -0700)
commit3bb314f01c189f0c48c0946424955c6d8ddce3d8
treed0de7369247689f009c2e0f3fb3bd121555efce1
parent535e0c1726bec699a8f0f5b86fe7d399546b2555
parentce6c3997c2fce74d12e6d8887a1d8cdf024fa850
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