]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26d451b f671c09)
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 16 Feb 2006 22:04:08 +0000 (14:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 16 Feb 2006 22:04:08 +0000 (14:04 -0800)

Trivial merge
Linux 2.6 source tree