summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 20:59:44 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-03 20:59:44 +0200
commit2ddcca36c8bcfa251724fe342c8327451988be0d (patch)
tree034af672e915c73a7bb2c5d2719d19f87dcecd3f
parentMerge git://git.infradead.org/battery-2.6 (diff)
downloadlinux-2ddcca36c8bcfa251724fe342c8327451988be0d.tar.xz
linux-2ddcca36c8bcfa251724fe342c8327451988be0d.zip
Linux 2.6.26-rc1v2.6.26-rc1
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5cf825819533..4492984efc09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 25
-EXTRAVERSION =
+SUBLEVEL = 26
+EXTRAVERSION = -rc1
NAME = Funky Weasel is Jiggy wit it
# *DOCUMENTATION*