]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.26' into zygo-2.6.32.26-zb64 zygo-2.6.32.26-zb64
authorZygo Blaxell <zblaxell@inara.furryterror.org>
Wed, 24 Nov 2010 15:06:35 +0000 (10:06 -0500)
committerZygo Blaxell <zblaxell@inara.furryterror.org>
Wed, 24 Nov 2010 15:06:35 +0000 (10:06 -0500)
1  2 
Makefile

diff --cc Makefile
index a5dc57799ee574b6016a5fb911f35b8fc5524ce4,733aac3f9a8aa196b3c0756141c5bbb8e9ace07b..18f955dcb39b44e49142f4c533c293c69ea317d9
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .25
+ EXTRAVERSION = .26
  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