]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.11' into zygo-2.6.32.11-zb5u zygo-2.6.32.11-zb5u
authorZygo Blaxell <zblaxell@feedme.hungrycats.org>
Sat, 3 Apr 2010 22:11:13 +0000 (18:11 -0400)
committerZygo Blaxell <zblaxell@feedme.hungrycats.org>
Sat, 3 Apr 2010 22:11:13 +0000 (18:11 -0400)
1  2 
Makefile

diff --cc Makefile
index 209655c8d27803c750620bd22262d61aa61d19dd,78611d9adc7211c28f263e2109252da882d877dd..1c400a5da0c5ea9996bef0293f0f78af2ac578fc
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .10
+ EXTRAVERSION = .11
  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