]> git.neil.brown.name Git - history.git/commitdiff
Merge http://oss.sgi.com:8090/xfs-linux-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 13 Oct 2004 00:28:23 +0000 (17:28 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 13 Oct 2004 00:28:23 +0000 (17:28 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge