Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 04:15:57 +0000 (20:15 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Feb 2006 04:15:57 +0000 (20:15 -0800)

Trivial merge