]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.39.3' into zygo-2.6.39.3-zb5s zygo-2.6.39.3-zb5s
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Sun, 17 Jul 2011 19:36:29 +0000 (19:36 +0000)
committerZygo Blaxell <zblaxell@waya.furryterror.org>
Sun, 17 Jul 2011 19:36:29 +0000 (19:36 +0000)
1  2 
Makefile

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