um: merge arch/um/os-Linux/sys-{i386,x86_64}

[firefly-linux-kernel-4.4.55.git] / Makefile

diff --git a/Makefile b/Makefile
index c3e90c530a654e4fe55f880ce47c513a9dd439e0..07bc92544e9cab9ea9fd201b8a5f36fb9dbb9168 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 1
 SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION =
 NAME = "Divemaster Edition"
 
 # *DOCUMENTATION*