]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.7' into zygo-2.6.32.7-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 29 Jan 2010 18:16:24 +0000 (13:16 -0500)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 29 Jan 2010 18:16:24 +0000 (13:16 -0500)
1  2 
Makefile

diff --cc Makefile
index 39b65c37a603a80b6c31c364a6f0246b55c994c4,07d3c6ac5502a3f0c206ccebc4a636ff6c3f3909..c3dfa6cd58082f76d106fb63c27a497c23220473
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .6
+ EXTRAVERSION = .7
  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