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>		2008-12-04 17:16:36 +11:00
..
dlmapi.h
dlmast.c
dlmcommon.h
dlmconvert.c
dlmconvert.h
dlmdebug.c	ocfs2/dlm: dlmdebug.c: make 2 functions static	2008-04-30 17:09:40 -07:00
dlmdebug.h	[PATCH 2/3] ocfs2/dlm: Silence build warnings	2008-05-30 15:15:10 -07:00
dlmdomain.c
dlmdomain.h
dlmfs.c	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
dlmfsver.c
dlmfsver.h
dlmlock.c
dlmmaster.c	[PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()	2008-07-07 11:24:29 -07:00
dlmrecovery.c
dlmthread.c
dlmunlock.c
dlmver.c
dlmver.h
Makefile
userdlm.c
userdlm.h	ocfs2: comments typo fix	2008-12-01 14:46:31 -08:00