Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Mar 2009 20:23:59 +0000 (13:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Mar 2009 20:23:59 +0000 (13:23 -0700)
commit99adcd9d67aaf04e28f5ae96df280f236bde4b66
tree4fd43e20697199bd2884a21a8d469f0ff6632cbd
parent2d5516cbb9daf7d0e342a2e3b0fc6f8c39a81205
parent753b7aea8e4611433c13ac157f944d8b4bf42482
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] Add p4-clockmod sysfs-ui removal to feature-removal schedule.
  Revert "[CPUFREQ] Disable sysfs ui for p4-clockmod."