git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
fs
/
ocfs2
/
ver.c
diff --git
a/fs/ocfs2/ver.c
b/fs/ocfs2/ver.c
index
5405ce1
..
e2488f4
100644
(file)
--- a/
fs/ocfs2/ver.c
+++ b/
fs/ocfs2/ver.c
@@
-29,7
+29,7
@@
#include "ver.h"
-#define OCFS2_BUILD_VERSION "1.
3.3
"
+#define OCFS2_BUILD_VERSION "1.
5.0
"
#define VERSION_STR "OCFS2 " OCFS2_BUILD_VERSION