git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f3fdeb 5666c09)
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 06:59:38 +0000 (01:59 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 06:59:38 +0000 (01:59 -0500)

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