Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 17:43:50 +0000 (10:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 17:43:50 +0000 (10:43 -0700)
commita30bfd6cd47f387e060fb06d2ba688a491e6eaec
tree041f5d4ec714b573c2ed68c501b2dddca5cc4cba
parent4b17cafaa4cc000a490821db649c5a3bf7ba9671
parent415cf32c9cdfcc60f34d0ac17f29634e941ba7d2
Merge branch 'fixes' of git://git./linux/kernel/git/jlbec/ocfs2

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  O2net: Disallow o2net accept connection request from itself.
  ocfs2/dlm: remove potential deadlock -V3
  ocfs2/dlm: avoid incorrect bit set in refmap on recovery master
  Fix the nested PR lock calling issue in ACL
  ocfs2: Count more refcount records in file system fragmentation.
  ocfs2 fix o2dlm dlm run purgelist (rev 3)
  ocfs2/dlm: fix a dead lock
  ocfs2: do not overwrite error codes in ocfs2_init_acl