]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.36.4' into zygo-2.6.36.4-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 18 Feb 2011 08:34:43 +0000 (03:34 -0500)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 18 Feb 2011 08:34:43 +0000 (03:34 -0500)
1  2 
Makefile

diff --cc Makefile
index 1ab5223dc07ce93fae9d5d44c19a366f239947c6,d831b481c0e88c4a4c74b588660ad5784131bd11..b8690ca21b3f567b2800f8feaee7012f4b9ddd65
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 36
- EXTRAVERSION = .3
+ EXTRAVERSION = .4
  NAME = Flesh-Eating Bats with Fangs
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb64
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README