You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

James Morris ec98ce480a Merge branch 'master' into next ... Conflicts: fs/nfsd/nfs4recover.c Manually fixed above to use new creds API functions, e.g. nfs4_save_creds(). Signed-off-by: James Morris <jmorris@namei.org>		16 years ago
..
Makefile	…
dlmapi.h	…
dlmast.c	…
dlmcommon.h	…
dlmconvert.c	…
dlmconvert.h	…
dlmdebug.c	…
dlmdebug.h	[PATCH 2/3] ocfs2/dlm: Silence build warnings	17 years ago
dlmdomain.c	…
dlmdomain.h	…
dlmfs.c	Merge branch 'master' into next	16 years ago
dlmfsver.c	…
dlmfsver.h	…
dlmlock.c	…
dlmmaster.c	[PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()	17 years ago
dlmrecovery.c	…
dlmthread.c	…
dlmunlock.c	…
dlmver.c	…
dlmver.h	…
userdlm.c	…
userdlm.h	ocfs2: comments typo fix	16 years ago