drm/armada: use drm_plane_force_disable() to disable the overlay plane

[deliverable/linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 35b4c196c171306f8ce66791eb6f91f57fbbb215..c3615937df3891f8418db7a05656c9969954ee80 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 2
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION =
 NAME = Hurr durr I'ma sheep
 
 # *DOCUMENTATION*