]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.31.13' into zygo-2.6.31.13-zb64 zygo-2.6.31.13-zb64
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Sat, 3 Apr 2010 22:20:21 +0000 (18:20 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Sat, 3 Apr 2010 22:20:21 +0000 (18:20 -0400)
1  2 
Makefile

diff --cc Makefile
index 85cac93bce0017f1311cc9af9bd2b68eeab8a261,ac8ee8ed30ab352418529368931b67224d251559..506a57f481266eb7c9e4747ad94109d1000a0724
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 31
- EXTRAVERSION = .12
+ EXTRAVERSION = .13
  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