From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 25 Mar 2006 16:50:56 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
X-Git-Tag: v2.6.17-rc1~731
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c50527379496bb7a662f181d0baf0bf2c7a88a6;p=linux-2.6

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
---

0c50527379496bb7a662f181d0baf0bf2c7a88a6