projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
[cascardo/linux.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6486af1
..
234bae6
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 21
-EXTRAVERSION = -rc
6
+EXTRAVERSION = -rc
7
NAME = Nocturnal Monster Puppy
# *DOCUMENTATION*