]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 648bf4f 47c886b)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 19 Jan 2006 03:37:57 +0000 (19:37 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 19 Jan 2006 03:37:57 +0000 (19:37 -0800)

Trivial merge
Linux 2.6 source tree