]> Git Repo - linux.git/commitdiff
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
authorLinus Torvalds <[email protected]>
Sat, 25 Mar 2006 16:50:56 +0000 (08:50 -0800)
committerLinus Torvalds <[email protected]>
Sat, 25 Mar 2006 16:50:56 +0000 (08:50 -0800)
* '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


Trivial merge
This page took 0.056024 seconds and 4 git commands to generate.