Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 23:49:50 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 23:49:50 +0000 (15:49 -0800)

Trivial merge