diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-16 00:20:18 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-16 00:20:18 +0300 |
commit | 56012808f4d5606e401539f663d92009d964425b (patch) | |
tree | f3736a97725647393a2db7c95462d857115197ca /Makefile | |
parent | a814290e17ae314bd614476cffc6119846eca27e (diff) | |
parent | b2a731aa5cbca7e0252da75e16de7ae5feb1313a (diff) | |
download | linux-56012808f4d5606e401539f663d92009d964425b.tar.xz |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 33 -EXTRAVERSION = -rc4 +EXTRAVERSION = -rc6 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |