Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
authorSteve French <sfrench@us.ibm.com>
Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)
committerSteve French <sfrench@us.ibm.com>
Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)

Trivial merge