]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.36.3' into zygo-2.6.36.3-zb64 zygo-2.6.36.3-zb64
authorZygo Blaxell <zblaxell@river.furryterror.org>
Sat, 8 Jan 2011 03:19:16 +0000 (22:19 -0500)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Sat, 8 Jan 2011 03:19:16 +0000 (22:19 -0500)
1  2 
Makefile

diff --cc Makefile
index 5360a56e80c78c5c797525cbc6ff864cbc98b301,4519fc71d19ea1ca7949512a33d02e32bbec3091..1ab5223dc07ce93fae9d5d44c19a366f239947c6
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 36
- EXTRAVERSION = .2
+ EXTRAVERSION = .3
  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