]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.50' into zygo-2.6.32.50-zb64 zygo-2.6.32.50-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Thu, 15 Dec 2011 00:20:24 +0000 (19:20 -0500)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Thu, 15 Dec 2011 00:20:24 +0000 (19:20 -0500)
1  2 
Makefile

diff --cc Makefile
index c5dcb4ea18680b51a1c92b8d97db2960c510ad9d,f38986c00c2d85e9e40300ecc056f0098f92abe8..ca84ca649d9169ad33cc5e540c827c6f0ddcbb42
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .46
+ EXTRAVERSION = .50
  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