git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d40d9d2 3b44f13)
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 10 Nov 2005 09:12:10 +0000 (04:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 10 Nov 2005 09:12:10 +0000 (04:12 -0500)

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