]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.21' into zygo-2.6.32.21-zb64 zygo-2.6.32.21-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Sun, 29 Aug 2010 23:19:05 +0000 (19:19 -0400)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Sun, 29 Aug 2010 23:19:05 +0000 (19:19 -0400)
1  2 
Makefile

diff --cc Makefile
index cd7394e1636a20b36d56793de7086ed2b9453dd9,3e7196f091fa2b3f59eecb453156218745934b7b..8ed251e8e2d84c074a578b3ff077bdae1490f74b
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .20
+ EXTRAVERSION = .21
  NAME = Man-Eating Seals of Antiquity
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb64
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README