Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 20 Nov 2005 17:19:38 +0000 (09:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 20 Nov 2005 17:19:38 +0000 (09:19 -0800)

Trivial merge