]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.6' into zygo-2.6.32.6-zb64 zygo-2.6.32.6-zb64
authorZygo Blaxell <zblaxell@inara.furryterror.org>
Tue, 26 Jan 2010 12:58:05 +0000 (07:58 -0500)
committerZygo Blaxell <zblaxell@inara.furryterror.org>
Tue, 26 Jan 2010 12:58:05 +0000 (07:58 -0500)
1  2 
Makefile

diff --cc Makefile
index 0e4a62a75267ff5612f425871b3a417366b95df6,20da31216f50dded602b0b6f050a3aa4bcbacfd8..39b65c37a603a80b6c31c364a6f0246b55c994c4
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .4
+ EXTRAVERSION = .6
  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