diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 14:19:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 14:19:36 -0700 |
commit | 01fa4ba52c36224783107a40126f1c6354d4e965 (patch) | |
tree | f084372e990600fb7631a8e583b7ec287ae30a0c /fs/cifs/cifsfs.h | |
parent | fbad8991ef9d41d1fad587dff23fa6deff01af83 (diff) | |
parent | 04c05b4a68c0ab0d6bb41c710a646e56f62a70a3 (diff) | |
download | talos-op-linux-01fa4ba52c36224783107a40126f1c6354d4e965.tar.gz talos-op-linux-01fa4ba52c36224783107a40126f1c6354d4e965.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:
update cifs version to 1.75
[CIFS] possible memory corruption on mount
cifs: demote cERROR in build_path_from_dentry to cFYI
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 cb71dc1f94d1..95da8027983d 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -125,5 +125,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.74" +#define CIFS_VERSION "1.75" #endif /* _CIFSFS_H */ |