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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[sfrench/cifs-2.6.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 59cf6dacec072b76ac4aee84a424f6e7498cfda5..df6ce3e8009091b4b6a4e96e131bd1f7adcea74d 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 29
-EXTRAVERSION = -rc
5
+EXTRAVERSION = -rc
6
NAME = Erotic Pickled Herring
# *DOCUMENTATION*