Merge http://oss.oracle.com/git/ocfs2
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 04:43:11 +0000 (20:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 04:43:11 +0000 (20:43 -0800)

Trivial merge