git.openpandora.org
/
pandora-kernel.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...
[pandora-kernel.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b6c8790
..
66ee8b8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 2
0
-EXTRAVERSION =
+SUBLEVEL = 2
1
+EXTRAVERSION =
-rc2
NAME = Homicidal Dwarf Hamster
# *DOCUMENTATION*