diff options
author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 09:10:55 +0200 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 09:10:55 +0200 |
commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /Makefile | |
parent | of: Add support for ePAPR "stdout-path" property (diff) | |
parent | of: add missing major vendors (diff) | |
download | linux-d88cf7d7b4240b8df170ba105e414e476fb51cce.tar.xz linux-d88cf7d7b4240b8df170ba105e414e476fb51cce.zip |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 14 SUBLEVEL = 0 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = Shuffling Zombie Juror # *DOCUMENTATION* |