Merge omap-upstream

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

diff --git a/Makefile b/Makefile
index 8c01d51cc7aef5acfe2647bf8fa6beb3f9b50334..d9ad521936a8f37357896b17a24c8b5cef440b0f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc4
+EXTRAVERSION =-rc6
 NAME = Pink Farting Weasel
 
 # *DOCUMENTATION*