Merge current mainline tree into linux-omap tree

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

diff --git a/Makefile b/Makefile
index c909f6f13add23fb3cf515cc2c441eba73cf3fbf..f94e22a41c3cea3f24e4f3ce1a0c10551d4d33e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 25
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
 NAME = Funky Weasel is Jiggy wit it
 
 # *DOCUMENTATION*