summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-22 23:46:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-22 23:46:24 +0100
commit25cf0398bdf365d027e171116aa4a281e9cd3c1c (patch)
treea8be3d3d314625a376be0e62c67809dc22274dd4 /Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff)
parentARM: pxa: Add Balloon3 NAND ready check (diff)
downloadlinux-25cf0398bdf365d027e171116aa4a281e9cd3c1c.tar.xz
linux-25cf0398bdf365d027e171116aa4a281e9cd3c1c.zip
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9e3c89030f5c..5aa44278d956 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 37
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc6
NAME = Flesh-Eating Bats with Fangs
# *DOCUMENTATION*