summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 20:13:59 +0100
committerArnd Bergmann <arnd@arndb.de>2012-03-24 20:13:59 +0100
commit83fe628e16d84efc8df2731bc403eae4e4f53801 (patch)
tree9a51c292235621d0f4f632c2a55ddb5a6ab582af /Makefile
parentMerge branch 'samsung/soc' into next/soc2 (diff)
parentMerge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh in... (diff)
downloadlinux-83fe628e16d84efc8df2731bc403eae4e4f53801.tar.xz
linux-83fe628e16d84efc8df2731bc403eae4e4f53801.zip
Merge branch 'renesas/soc' into next/soc2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 66d13c917bc7..56d481727c30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 3
SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*