]> git.hungrycats.org Git - linux/commitdiff
Merge commit 'v2.6.32.17' into zygo-2.6.32.17-zb64 zygo-2.6.32.17-zb64
authorZygo Blaxell <zblaxell@inara.furryterror.org>
Fri, 6 Aug 2010 00:29:13 +0000 (20:29 -0400)
committerZygo Blaxell <zblaxell@inara.furryterror.org>
Fri, 6 Aug 2010 00:29:13 +0000 (20:29 -0400)
1  2 
Makefile

diff --cc Makefile
index d7779c966e2f1ab77e5cc89da773dd7fa9bf3f25,2e357cec332c456c995c46014c75ef0fc50a27b1..c6a42cc77167a745c4563706ff95fe65a6b3b7dc
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .16
+ EXTRAVERSION = .17
  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