]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.34.11' into zygo-2.6.34.11-zb64 zygo-2.6.34.11-zb64
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Sun, 25 Mar 2012 01:29:13 +0000 (21:29 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Sun, 25 Mar 2012 01:29:13 +0000 (21:29 -0400)
1  2 
Makefile

diff --cc Makefile
index 9261eb134f69e11dfcd6f9565f4609184ad1a085,38891550546091f20492d2cb00e9efe7ef124868..b30cc8ad456ed4c7a4fb9cdfc6953db008579a35
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 34
- EXTRAVERSION = .10
+ EXTRAVERSION = .11
  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