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

Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --cc fs/cifs/CHANGES
Simple merge

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/cifs/cifsfs.h
Simple merge

diff --cc fs/cifs/cifssmb.c
Simple merge

diff --cc fs/cifs/dir.c
Simple merge

diff --cc fs/cifs/file.c
Simple merge

diff --cc fs/cifs/inode.c
Simple merge

diff --cc fs/cifs/link.c
Simple merge

diff --cc fs/cifs/readdir.c
Simple merge