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

author Steve French <[email protected]>

Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)

committer Steve French <[email protected]>

Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)
author Steve French <[email protected]>
Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)
committer Steve French <[email protected]>
Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)
diff --cc fs/cifs/cifsfs.c
Simple merge
diff --cc fs/cifs/file.c
Simple merge
diff --cc fs/cifs/inode.c
Simple merge
author	Steve French <[email protected]>
	Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)
committer	Steve French <[email protected]>
	Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)
		1	2
fs/cifs/cifsfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/cifs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history