git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[sfrench/cifs-2.6.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index b76ee94a6c9ff9436f6fa59e0a2c779850a0715d..8a3c2717e3886c536b44a93dc5331054fbea1d24 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 22
-EXTRAVERSION = -rc
5
+EXTRAVERSION = -rc
6
NAME = Holy Dancing Manatees, Batman!
# *DOCUMENTATION*