]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.12' into zygo-2.6.32.12-zb64 zygo-2.6.32.12-zb64
authorZygo Blaxell <zblaxell@inara.furryterror.org>
Mon, 10 May 2010 15:36:27 +0000 (11:36 -0400)
committerZygo Blaxell <zblaxell@inara.furryterror.org>
Mon, 10 May 2010 15:36:27 +0000 (11:36 -0400)
1  2 
Makefile

diff --cc Makefile
index b31dc00eb5c39277f6aaa2fa5419e9dfed1edcb2,573578fc378af0006c03486438dcaa48a32bb2cf..4775ff8e9b812830756ac4408935eb43d81ec322
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .11
+ EXTRAVERSION = .12
  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