diff options
| author | H. Peter Anvin | 2011-08-05 21:25:56 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2011-08-05 21:25:56 +0200 |
| commit | 13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2 (patch) | |
| tree | 6a81d50b611170ca6dd1ed9cce2b86dd19f190d8 /fs/cifs/cifsfs.h | |
| parent | x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message (diff) | |
| parent | Linux 3.0 (diff) | |
| download | kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.gz kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.tar.xz kernel-qcow2-linux-13f9a3737c903ace57d8aaebe81a3bbaeb0aa0a2.zip | |
Merge commit 'v3.0' into x86/cpu
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); 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 */ |