aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsfs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 12:49:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 12:49:55 -0700
commitf560f6697f17e2465c8845c09f3a483faef38275 (patch)
treeb5b77d5f68ce957598e6b786a78c9dea78632ffa /fs/cifs/cifsfs.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[CIFS] update cifs to version 1.74 (diff)
downloadlinux-dev-f560f6697f17e2465c8845c09f3a483faef38275.tar.xz
linux-dev-f560f6697f17e2465c8845c09f3a483faef38275.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] update cifs to version 1.74 [CIFS] update limit for snprintf in cifs_construct_tcon cifs: Fix signing failure when server mandates signing for NTLMSSP
Diffstat (limited to 'fs/cifs/cifsfs.h')
-rw-r--r--fs/cifs/cifsfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 0900e1658c96..036ca83e5f46 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -129,5 +129,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
extern const struct export_operations cifs_export_ops;
#endif /* CIFS_NFSD_EXPORT */
-#define CIFS_VERSION "1.73"
+#define CIFS_VERSION "1.74"
#endif /* _CIFSFS_H */