diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-09 13:23:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-09 13:23:59 -0700 |
commit | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (patch) | |
tree | 4fd43e20697199bd2884a21a8d469f0ff6632cbd /fs/ocfs2/ocfs2_lockid.h | |
parent | 2d5516cbb9daf7d0e342a2e3b0fc6f8c39a81205 (diff) | |
parent | 753b7aea8e4611433c13ac157f944d8b4bf42482 (diff) |
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] Add p4-clockmod sysfs-ui removal to feature-removal schedule.
Revert "[CPUFREQ] Disable sysfs ui for p4-clockmod."
Diffstat (limited to 'fs/ocfs2/ocfs2_lockid.h')
0 files changed, 0 insertions, 0 deletions