Merge current mainline tree into linux-omap tree

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

diff --git a/Makefile b/Makefile
index f22e3adfc9ad73b8ffc5a9ca1a5c2c87e0e599f9..739a4c7cd2a998c38e83d382bf92cf81a89230cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 26
-EXTRAVERSION = -rc9
+EXTRAVERSION =
 NAME = Rotary Wombat
 
 # *DOCUMENTATION*