]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1b0477 eadf459)
Merge rsync://client.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 21:32:15 +0000 (14:32 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 21:32:15 +0000 (14:32 -0700)

Trivial merge
Linux 2.6 source tree