]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.12' into zygo-2.6.32.12-zb5u zygo-2.6.32.12-zb5u
authorZygo Blaxell <zblaxell@feedme.hungrycats.org>
Mon, 10 May 2010 17:44:12 +0000 (13:44 -0400)
committerZygo Blaxell <zblaxell@feedme.hungrycats.org>
Mon, 10 May 2010 17:44:12 +0000 (13:44 -0400)
1  2 
Makefile

diff --cc Makefile
index 1c400a5da0c5ea9996bef0293f0f78af2ac578fc,573578fc378af0006c03486438dcaa48a32bb2cf..bb9e4b46b574188fc56cd45edefabaa326990318
+++ 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)-zb5u
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README