Merge branch 'upstream' into for-linus

[linux-imx.git] / Makefile

diff --git a/Makefile b/Makefile
index fd4b3d038d757701bd94e2a9acdb462453a3196c..f6578f47e21e663402bfb2e401fbf8394024750a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
-PATCHLEVEL = 3
+PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc3
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*