Merge branch 'upstream-fixes'

[~andy/linux] / Makefile

diff --git a/Makefile b/Makefile
index 45e5a38fbc7aee34f68a852e4a6530609ccc52f2..fdb96bc85080700d0e8b551aff06dcf27b5ede7e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 13
-EXTRAVERSION =
+SUBLEVEL = 14
+EXTRAVERSION =-rc3
 NAME=Affluent Albatross
 
 # *DOCUMENTATION*