projects
/
linux-2.6-block.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/pablo/nf
[linux-2.6-block.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index ed6907448fb0b875b8fa6a101d8016148b4aa708..173437debc873cf1c38287fa288be0abfbc40df9 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 4
-PATCHLEVEL =
5
+PATCHLEVEL =
6
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION =
-rc2
NAME = Blurry Fish Butt
# *DOCUMENTATION*