]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.34.2' into zygo-2.6.34.2-zb64 zygo-2.6.34.2-zb64
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 6 Aug 2010 00:54:32 +0000 (20:54 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 6 Aug 2010 00:54:32 +0000 (20:54 -0400)
1  2 
Makefile

diff --cc Makefile
index 9114d5e60816b454b582ecc6b13d1d9bdb1db031,3db48a6586d27055561206b82d724da6bf4005e1..cd4d73c49a084f300953b9b427c642155cf6521c
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 34
- EXTRAVERSION = .1
+ EXTRAVERSION = .2
  NAME = Sheep on Meth
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb64
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README