diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 15:49:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 15:49:55 -0400 |
| commit | f560f6697f17e2465c8845c09f3a483faef38275 (patch) | |
| tree | b5b77d5f68ce957598e6b786a78c9dea78632ffa /fs/cifs/cifsfs.h | |
| parent | 3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199 (diff) | |
| parent | c2ec9471b5b1307429aef1cfaa2b3ae453a61d6f (diff) | |
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.h | 2 |
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); | |||
| 129 | extern const struct export_operations cifs_export_ops; | 129 | extern const struct export_operations cifs_export_ops; |
| 130 | #endif /* CIFS_NFSD_EXPORT */ | 130 | #endif /* CIFS_NFSD_EXPORT */ |
| 131 | 131 | ||
| 132 | #define CIFS_VERSION "1.73" | 132 | #define CIFS_VERSION "1.74" |
| 133 | #endif /* _CIFSFS_H */ | 133 | #endif /* _CIFSFS_H */ |