Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorSteve French <sfrench@us.ibm.com>
Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)
committerSteve French <sfrench@us.ibm.com>
Thu, 12 Jan 2006 22:47:08 +0000 (14:47 -0800)
commit94bc2be31a01a3055ec94176e595dfe208e92d3b
treeebfbe81c6718a6390bfa1b99c6d228237d818576
parentc32a0b689cb9cc160cfcd19735bbf50bb70c6ef4
parent58cba4650a7a414eabd2b40cc9d8e45fcdf192d9
Merge ... /linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/cifsfs.c
fs/cifs/file.c
fs/cifs/inode.c