git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 221fc10 9e56904)
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:22:57 +0000 (15:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:22:57 +0000 (15:22 -0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.