diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 02:33:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 02:33:56 +0200 |
| commit | 4c015ba24bbe8558cce5925546abd590e4146a23 (patch) | |
| tree | 8bff5827d8667c7d2d87b0daec763e41a8a7b0b0 /fs/cifs/cifsfs.h | |
| parent | drivers: usb: core: hcd: if-else-braces fixed (diff) | |
| parent | Linux 3.12-rc4 (diff) | |
| download | linux-4c015ba24bbe8558cce5925546abd590e4146a23.tar.xz linux-4c015ba24bbe8558cce5925546abd590e4146a23.zip | |
Merge 3.12-rc4 into usb-next
We want the USB fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 ea723a5e8226..6d0b07217ac9 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -132,5 +132,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); extern const struct export_operations cifs_export_ops; #endif /* CONFIG_CIFS_NFSD_EXPORT */ -#define CIFS_VERSION "2.01" +#define CIFS_VERSION "2.02" #endif /* _CIFSFS_H */ |