]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.33.4' into zygo-2.6.33.4-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Tue, 25 May 2010 17:47:22 +0000 (13:47 -0400)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Tue, 25 May 2010 17:47:22 +0000 (13:47 -0400)
1  2 
Makefile

diff --cc Makefile
index 3f55e0c5fd6dd4158189ca408120a22747d4cdca,f668e8ce7ce6a10e434f04ecc67dd808741c722e..e3dbde841c8dadd680144fc6c4bead9f3ec671f2
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 33
- EXTRAVERSION = .3
+ EXTRAVERSION = .4
  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