diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /Makefile | |
parent | 392c57a2ec811db37ae45adc513704cf92ba3e69 (diff) | |
parent | cccf59abea4e1c36322e365d6e61ff7de1f3ee07 (diff) |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
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 = 35 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = Sheep on Meth # *DOCUMENTATION* |