Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / Makefile

diff --git a/Makefile b/Makefile
index d9ad521936a8f37357896b17a24c8b5cef440b0f..a4b4b730f10b2972739469bc53a8424095c52bf6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc6
-NAME = Pink Farting Weasel
+EXTRAVERSION =-rc7
+NAME = Arr Matey! A Hairy Bilge Rat!
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"