Merge branches 'amba', 'devel-stable', 'kexec-for-next' and 'misc' into for-linus

[sfrench/cifs-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index ed6907448fb0b875b8fa6a101d8016148b4aa708..1d0aef03eae7fae72f70016575c2f54502706bbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
-PATCHLEVEL = 5
+PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc3
 NAME = Blurry Fish Butt
 
 # *DOCUMENTATION*