summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/userdlm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 03:17:47 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 03:17:47 +0100
commit89a2fa5f2139be35e214bcf86a8291d6a1da75f2 (patch)
tree850ea412b013360bcace751db91cac6fb0067535 /fs/ocfs2/dlm/userdlm.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
parent[PARISC] New syscalls (inotify, *at, pselect6/ppoll, migrate_pages) (diff)
downloadlinux-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.tar.xz
linux-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'fs/ocfs2/dlm/userdlm.c')
0 files changed, 0 insertions, 0 deletions