Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 23:32:03 +0000 (16:32 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 23:32:03 +0000 (16:32 -0700)

Trivial merge