Merge current mainline tree into linux-omap tree

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

diff --git a/Makefile b/Makefile
index 85cc07c668868c07530ecd79d1d77b626f85de71..38622083f335a5fce99f8af46123c760cba86103 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 26
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME = Funky Weasel is Jiggy wit it
 
 # *DOCUMENTATION*