]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.27.55' into zygo-2.6.27.55-zb64 zygo-2.6.27.55-zb64
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 29 Oct 2010 16:09:18 +0000 (12:09 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 29 Oct 2010 16:09:18 +0000 (12:09 -0400)
1  2 
Makefile

diff --cc Makefile
index 2cfb998d5df43dd8e0b46330dd919e6117fa81ea,113cdba10f57b5cba29a33eb516a92704f74106c..fa3c117bed64ed8427d587c8a660bda39f34e30d
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 27
- EXTRAVERSION = .54
+ EXTRAVERSION = .55
  NAME = Trembling Tortoise
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb64
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README