Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

[deliverable/linux.git] / Makefile

diff --git a/Makefile b/Makefile
index a192280a883d139594c7ec4aa1bd9914e206a0d0..b77de27e58fc6ecbec9aa292d6a36fc1433dcd2a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 17
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION =
 NAME = Shuffling Zombie Juror
 
 # *DOCUMENTATION*