aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-13 01:02:18 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-13 01:02:18 +0100
commit9277bf4b4f94655eef177d0daffa90a47c51eb62 (patch)
tree569b5a13b3f7030a603460d8d9ded035a6f7f48f /Makefile
parent897493504addc5609f04a2c4f73c37ab972c29b2 (diff)
parent49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff)
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4df9873f83b..92ab33f16cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 36
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
NAME = Sheep on Meth
# *DOCUMENTATION*