summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt2009-11-12 00:59:04 +0100
committerBenjamin Herrenschmidt2009-11-12 00:59:04 +0100
commit0526484aa345adbf790d1201a6f5d09be0a648a3 (patch)
tree8da37ac2858a960e80dc59ebc4afc460935724f4 /Makefile
parentpowerpc/kvm: Fix non-modular build (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
downloadkernel-qcow2-linux-0526484aa345adbf790d1201a6f5d09be0a648a3.tar.gz
kernel-qcow2-linux-0526484aa345adbf790d1201a6f5d09be0a648a3.tar.xz
kernel-qcow2-linux-0526484aa345adbf790d1201a6f5d09be0a648a3.zip
Merge commit 'origin/master' into next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9425d1de54c7..b4c04f734e56 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 32
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = Man-Eating Seals of Antiquity
# *DOCUMENTATION*