tree 93134000bcc725f2ae4679f8d9f434ae17f2480d
parent 7d14f145f839b5d0d221ea209b4998f93267e2ec
parent ea8aa68d36026c4c3d938170b06957aeac9682f4
author Linus Torvalds <torvalds@g5.osdl.org> 1143305456 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143305456 -0800

Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

* 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2:
  ocfs2: finally remove MLF* macros
  ocfs2: don't use MLF* in the file system
  ocfs2: don't use MLF* in dlm/ files
  ocfs2: don't use MLF* in cluster/ files
  [PATCH] ocfs2: dlm recovery fixes
  [PATCH] ocfs2: fix hang in dlm lock resource mastery
  ocfs2: use __attribute__ format