summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:02 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:02 +0200
commit91056a63a7d8dbc817747a22d9a9490463323575 (patch)
treea220d265d01075c05f4cd35d998e65849bb47bc8 /Makefile
parent05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff)
parentf2d8df92f69b8c719ca1a46d2615b168b2cc9cdf (diff)
downloadlinux-stable-91056a63a7d8dbc817747a22d9a9490463323575.tar.gz
linux-stable-91056a63a7d8dbc817747a22d9a9490463323575.tar.bz2
linux-stable-91056a63a7d8dbc817747a22d9a9490463323575.zip
Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 788511f86a62..31f967c31e7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 1
SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc9
NAME = "Divemaster Edition"
# *DOCUMENTATION*