projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.34-rc1' into for-2.6.35
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ocfs2
/
dlm
/
dlmver.c
diff --git
a/fs/ocfs2/dlm/dlmver.c
b/fs/ocfs2/dlm/dlmver.c
index 7ef2653f8f41cfd3fd346f014f082384669f340a..dfc0da4d158dc49090389a1c7164a71a01cf1136 100644
(file)
--- a/
fs/ocfs2/dlm/dlmver.c
+++ b/
fs/ocfs2/dlm/dlmver.c
@@
-28,7
+28,7
@@
#include "dlmver.h"
-#define DLM_BUILD_VERSION "1.
3.3
"
+#define DLM_BUILD_VERSION "1.
5.0
"
#define VERSION_STR "OCFS2 DLM " DLM_BUILD_VERSION