Merge current mainline tree into linux-omap tree

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

diff --git a/Makefile b/Makefile
index 56f77be2a3737c70821521b9d221b0c687c4dd87..968e949e4729ea453a26ab43cb8b5856aa0c1a27 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 25
-EXTRAVERSION = -rc1
-NAME = Arr Matey! A Hairy Bilge Rat!
+EXTRAVERSION = -rc2
+NAME = Funky Weasel is Jiggy wit it
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"