Joel Becker fc3718918f Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window ... Conflicts: fs/ocfs2/ocfs2.h		2010-10-15 13:03:09 -07:00
..
dlmapi.h
dlmast.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
dlmcommon.h	ocfs2/dlm: Add message DLM_QUERY_NODEINFO	2010-10-07 16:47:03 -07:00
dlmconvert.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
dlmconvert.h
dlmdebug.c	Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window	2010-10-15 13:03:09 -07:00
dlmdebug.h
dlmdomain.c	ocfs2/cluster: Bump up dlm protocol to version 1.1	2010-10-09 10:27:04 -07:00
dlmdomain.h
dlmlock.c	fs/ocfs2/dlm: Drop memory allocation cast	2010-05-18 12:31:10 -07:00
dlmmaster.c	o2dlm: force free mles during dlm exit	2010-09-23 14:16:53 -07:00
dlmrecovery.c	ocfs2/dlm: avoid incorrect bit set in refmap on recovery master	2010-08-07 10:49:41 -07:00
dlmthread.c	ocfs2/dlm: avoid incorrect bit set in refmap on recovery master	2010-08-07 10:49:41 -07:00
dlmunlock.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
dlmver.c
dlmver.h
Makefile	ocfs2_dlmfs: Move to its own directory	2010-02-26 15:41:14 -08:00