Merge with /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/
authorSteve French <sfrench@us.ibm.com>
Fri, 21 Oct 2005 15:39:12 +0000 (08:39 -0700)
committerSteve French <sfrench@us.ibm.com>
Fri, 21 Oct 2005 15:39:12 +0000 (08:39 -0700)

Trivial merge