linux-stable-rt/fs/ocfs2/dlm
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
..
Makefile
dlmapi.h
dlmast.c
dlmcommon.h
dlmconvert.c
dlmconvert.h
dlmdebug.c
dlmdebug.h
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
dlmrecovery.c
dlmthread.c
dlmunlock.c
dlmver.c
dlmver.h
userdlm.c
userdlm.h