Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

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

Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)

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

Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)
author Steve French <sfrench@us.ibm.com>
Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)
committer Steve French <sfrench@us.ibm.com>
Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)
diff --cc fs/Kconfig
Simple merge
diff --cc fs/cifs/cifsfs.c
Simple merge
diff --cc fs/cifs/cifsfs.h
Simple merge
diff --cc fs/cifs/file.c
Simple merge
author	Steve French <sfrench@us.ibm.com>
	Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)
committer	Steve French <sfrench@us.ibm.com>
	Sun, 25 Jun 2006 15:57:32 +0000 (15:57 +0000)
		1	2
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history