aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-12 21:45:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-12 21:45:56 -0400
commit39403865d2e4590802553370a56c9ab93131e4ee (patch)
treece9a69c3dc4b8c81fb0c1fe1f6b60cfe6d939956 /Makefile
parentf7d02ae76ebbf5b8a9531fe150c49e126a397704 (diff)
Linux 2.6.22-rc1v2.6.22-rc1
.. close the merge window
Diffstat (limited to 'Makefile')
-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 @@
1VERSION = 2 1VERSION = 2
2PATCHLEVEL = 6 2PATCHLEVEL = 6
3SUBLEVEL = 21 3SUBLEVEL = 22
4EXTRAVERSION = 4EXTRAVERSION = -rc1
5NAME = Nocturnal Monster Puppy 5NAME = Nocturnal Monster Puppy
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*