]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.18' into zygo-2.6.32.18-zb64 zygo-2.6.32.18-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 13 Aug 2010 20:25:05 +0000 (16:25 -0400)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 13 Aug 2010 20:25:05 +0000 (16:25 -0400)
1  2 
Makefile

diff --cc Makefile
index c6a42cc77167a745c4563706ff95fe65a6b3b7dc,e86dbf71dcf41fedc29f17c2585ac66578f93f23..c60676902ba72a7b33776e2355a640e480252908
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .17
+ EXTRAVERSION = .18
  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