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

diff --cc Makefile
index 0cb0507f90f2ef2d5b5e38b865bf1bf45665b854,35160e38fd7c238bbd8a501a7f8321349ac77a95..8617ffb72418822c7ab7b6c6c38195e0cf352de9
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 33
- EXTRAVERSION = .1
+ EXTRAVERSION = .2
  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