]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.1' into zygo-2.6.32.1-zb64 zygo-2.6.32.1-zb64
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Thu, 17 Dec 2009 02:09:37 +0000 (21:09 -0500)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Thu, 17 Dec 2009 02:09:37 +0000 (21:09 -0500)
1  2 
Makefile

diff --cc Makefile
index e8586e1a97c4d8307cff0cf6baf48cdeb30cb6ea,d0d7e9c7abeca7cf9e99d58da8717bad2e82601a..0ebc69f29ae7897b7eca254e7a63b1b345bf6911
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION =
+ EXTRAVERSION = .1
  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