Merge current mainline tree into linux-omap tree

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

diff --git a/Makefile b/Makefile
index f493ee3b01937f3af5cfb9c7dc4b3884bb382ee9..ce3666998752a11bdb7e9f9dd6f2ab283e07811c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 28
-EXTRAVERSION = -rc6
-NAME = Killer Bat of Doom
+EXTRAVERSION = -rc7
+NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"