]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f6b29c2 0e55fcc)
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 16:50:56 +0000 (08:50 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 16:50:56 +0000 (08:50 -0800)
commit72e35ed763e7d2898be4a0bdd9f437145716c97e
tree93134000bcc725f2ae4679f8d9f434ae17f2480dtree | snapshot
parentf6b29c2dc91effbd12b2957a6b3195317359f7d0commit | diff
parent0e55fcc54118576b40d24423597a7d0381150196commit | diff
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
Linux Kernel Source Tree.