From: Linus Torvalds Date: Fri, 4 May 2012 22:34:21 +0000 (-0700) Subject: Merge git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c6de1687f57893df31fd5266ead3479418230a06;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fixes from Steve French. * git://git.samba.org/sfrench/cifs-2.6: fs/cifs: fix parsing of dfs referrals cifs: make sure we ignore the credentials= and cred= options [CIFS] Update cifs version to 1.78 cifs - check S_AUTOMOUNT in revalidate cifs: add missing initialization of server->req_lock cifs: don't cap ra_pages at the same level as default_backing_dev_info CIFS: Fix indentation in cifs_show_options --- c6de1687f57893df31fd5266ead3479418230a06