Linus Torvalds 498f7f505d Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits) MAINTAINERS: Update Joel Becker's email address ocfs2: Remove unused truncate function from alloc.c ocfs2/cluster: dereferencing before checking in nst_seq_show() ocfs2: fix build for OCFS2_FS_STATS not enabled ocfs2/cluster: Show o2net timing statistics ocfs2/cluster: Track process message timing stats for each socket ocfs2/cluster: Track send message timing stats for each socket ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking ocfs2: Add DEBUG_FS dependency ocfs2/dlm: Hard code the values for enums ocfs2/dlm: Minor cleanup ocfs2/dlm: Cleanup dlmdebug.c ocfs2: Release buffer_head in case of error in ocfs2_double_lock. ocfs2/cluster: Pin the local node when o2hb thread starts ocfs2/cluster: Show pin state for each o2hb region ocfs2/cluster: Pin/unpin o2hb regions ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap ocfs2/cluster: Pin the remote node item in configfs ocfs2/dlm: make existing convertion precedent over new lock ...		2011-01-11 11:28:34 -08:00
..
dlmapi.h
dlmast.c	ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c	2010-12-16 00:46:05 -08:00
dlmcommon.h	ocfs2/dlm: Hard code the values for enums	2010-12-22 18:34:46 -08:00
dlmconvert.c
dlmconvert.h
dlmdebug.c	ocfs2/dlm: Minor cleanup	2010-12-22 18:34:45 -08:00
dlmdebug.h	ocfs2/dlm: Cleanup dlmdebug.c	2010-12-22 18:34:44 -08:00
dlmdomain.c	ocfs2/cluster: Pin/unpin o2hb regions	2010-12-16 00:47:44 -08:00
dlmdomain.h
dlmlock.c	ocfs2/dlm: make existing convertion precedent over new lock	2010-12-16 00:46:08 -08:00
dlmmaster.c	ocfs2/dlm: Migrate lockres with no locks if it has a reference	2010-12-09 15:36:00 -08: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: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c	2010-12-16 00:46:05 -08:00
dlmunlock.c
dlmver.c
dlmver.h
Makefile