summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2014-03-31 09:10:55 +0200
committerGrant Likely <grant.likely@linaro.org>2014-03-31 09:10:55 +0200
commitd88cf7d7b4240b8df170ba105e414e476fb51cce (patch)
tree7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /Makefile
parentof: Add support for ePAPR "stdout-path" property (diff)
parentof: add missing major vendors (diff)
downloadlinux-d88cf7d7b4240b8df170ba105e414e476fb51cce.tar.xz
linux-d88cf7d7b4240b8df170ba105e414e476fb51cce.zip
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 48a4a5b3f741..c2bb9d3c3a78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 14
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = Shuffling Zombie Juror
# *DOCUMENTATION*