aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-22 11:30:12 -0800
committerTony Lindgren <tony@atomide.com>2010-12-22 11:30:12 -0800
commitc10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (patch)
treeb2a44e08e9e683078e9d20d6072a513798788314 /Makefile
parentOMAP2/3: OneNAND: add 104MHz support (diff)
parentKeyboard: omap-keypad: use matrix_keypad.h (diff)
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5aa44278d956..77044b7918a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 37
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME = Flesh-Eating Bats with Fangs
# *DOCUMENTATION*