Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

author Steve French <sfrench@us.ibm.com>

Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)

committer Steve French <sfrench@us.ibm.com>

Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)
author Steve French <sfrench@us.ibm.com>
Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)
committer Steve French <sfrench@us.ibm.com>
Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)
diff --cc fs/cifs/cifsproto.h
Simple merge
diff --cc fs/cifs/cifssmb.c
Simple merge
diff --cc fs/cifs/file.c
Simple merge
author	Steve French <sfrench@us.ibm.com>
	Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)
committer	Steve French <sfrench@us.ibm.com>
	Thu, 23 Jun 2005 01:26:47 +0000 (20:26 -0500)
		1	2
fs/cifs/cifsproto.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifssmb.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history