]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.31.9' into zygo-2.6.31.9-zb64 zygo-2.6.31.9-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Tue, 22 Dec 2009 02:21:31 +0000 (21:21 -0500)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Tue, 22 Dec 2009 02:21:31 +0000 (21:21 -0500)
1  2 
Makefile

diff --cc Makefile
index ccdcef6f044facc943bb9176ed0d273b58f377d9,72b531554cb972471e5395e63b92e1f3f215f55e..79f843fb142ecb9370c50427d2137330700fc701
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 31
- EXTRAVERSION = .8
+ EXTRAVERSION = .9
  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