]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.20' into zygo-2.6.32.20-zb64 zygo-2.6.32.20-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Sun, 22 Aug 2010 22:45:43 +0000 (18:45 -0400)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Sun, 22 Aug 2010 22:45:43 +0000 (18:45 -0400)
1  2 
Makefile

diff --cc Makefile
index 6586a66cf6fb9dea2d6e187c7b2fdf87dbe6d70f,ad4d191004594d8eb7623eb684a43b61b0123b14..cd7394e1636a20b36d56793de7086ed2b9453dd9
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .19
+ EXTRAVERSION = .20
  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