Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
9db7372445
linux/fs/ocfs2/dlm
History
David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 17:01:28 +00:00
..
dlmapi.h ocfs2: Allow binary names in the DLM 2006-09-24 13:50:42 -07:00
dlmast.c ocfs2: Silence dlm error print 2006-09-24 13:50:41 -07:00
dlmcommon.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
dlmconvert.c ocfs2: fix compiler warnings in dlm_convert_lock_handler() 2006-06-26 14:43:20 -07:00
dlmconvert.h [PATCH] OCFS2: The Second Oracle Cluster Filesystem 2006-01-03 11:45:47 -08:00
dlmdebug.c [PATCH] fs/ocfs2/dlm/: cleanups 2006-06-26 14:43:21 -07:00
dlmdomain.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 17:01:28 +00:00
dlmdomain.h [PATCH] OCFS2: The Second Oracle Cluster Filesystem 2006-01-03 11:45:47 -08:00
dlmfs.c [PATCH] r/o bind mount prepwork: inc_nlink() helper 2006-10-01 00:39:30 -07:00
dlmfsver.c [PATCH] OCFS2: The Second Oracle Cluster Filesystem 2006-01-03 11:45:47 -08:00
dlmfsver.h [PATCH] OCFS2: The Second Oracle Cluster Filesystem 2006-01-03 11:45:47 -08:00
dlmlock.c ocfs2: Allow binary names in the DLM 2006-09-24 13:50:42 -07:00
dlmmaster.c ocfs2: Allow binary names in the DLM 2006-09-24 13:50:42 -07:00
dlmrecovery.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
dlmthread.c ocfs2: use cond_resched() in dlm_thread() 2006-06-26 14:43:13 -07:00
dlmunlock.c ocfs2: fix check for locally granted state during dlmunlock() 2006-08-07 10:55:22 -07:00
dlmver.c [PATCH] OCFS2: The Second Oracle Cluster Filesystem 2006-01-03 11:45:47 -08:00
dlmver.h [PATCH] OCFS2: The Second Oracle Cluster Filesystem 2006-01-03 11:45:47 -08:00
Makefile [PATCH] OCFS2: The Second Oracle Cluster Filesystem 2006-01-03 11:45:47 -08:00
userdlm.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
userdlm.h ocfs2: Update dlmfs for new dlmlock() API 2006-09-24 13:50:42 -07:00