summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-13 03:45:56 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-13 03:45:56 +0200
commit39403865d2e4590802553370a56c9ab93131e4ee (patch)
treece9a69c3dc4b8c81fb0c1fe1f6b60cfe6d939956
parentMerge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-39403865d2e4590802553370a56c9ab93131e4ee.tar.xz
linux-39403865d2e4590802553370a56c9ab93131e4ee.zip
Linux 2.6.22-rc1v2.6.22-rc1
.. close the merge window
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index dfe559c89fe6..e6990e2cdafc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 21
-EXTRAVERSION =
+SUBLEVEL = 22
+EXTRAVERSION = -rc1
NAME = Nocturnal Monster Puppy
# *DOCUMENTATION*