Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core...

[~andy/linux] / Makefile

diff --git a/Makefile b/Makefile
index 92ab33f16cf0a31256b754cf4f1f46fafb83d3a8..3133a5772eeb13e85f4eedf994ac662213b3e48c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 36
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc5
 NAME = Sheep on Meth
 
 # *DOCUMENTATION*