summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 23:22:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 23:22:24 +0200
commit5dd34572ad9a3be430632dd42e4af2ea370b397b (patch)
tree5f08f98a570d3d8af283d529a2b145a270f62805 /Makefile
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
downloadlinux-5dd34572ad9a3be430632dd42e4af2ea370b397b.tar.xz
linux-5dd34572ad9a3be430632dd42e4af2ea370b397b.zip
Linux 2.6.26-rc6v2.6.26-rc6
.. and a new name, courtesy of Alan.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2b951205317d..6923d669a4f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26
-EXTRAVERSION = -rc5
-NAME = Funky Weasel is Jiggy wit it
+EXTRAVERSION = -rc6
+NAME = Rotary Wombat
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"