[CIFS] acl support part 6

Acked-by: Shirish Pargaonkar <shirishp@us.ibm.com>
CC: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

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

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

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

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

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

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

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

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

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

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