diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 03:10:55 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 03:10:55 -0400 |
| commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
| tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /Makefile | |
| parent | 676e1b2fcd9dbb47a59baac13d089621d22c68b8 (diff) | |
| parent | 6f976267da0e2c873c4b4aaacaf08266d1d1797d (diff) | |
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 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 14 | 2 | PATCHLEVEL = 14 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc5 | 4 | EXTRAVERSION = -rc6 |
| 5 | NAME = Shuffling Zombie Juror | 5 | NAME = Shuffling Zombie Juror |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |