summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-22 13:40:42 -0700
committerKeith Packard <keithp@keithp.com>2011-07-22 13:40:42 -0700
commitdf7976797fa9af161690dbf4dee81ed92cdc150f (patch)
treebe6f04706d91cc80da4dbd3a5f5f2a174f1bdae3 /Makefile
parentf0b69efc29b024747a88ce020dada425e3193d5a (diff)
parent9c54c0dd948d715ccfd79e97d852f80eeb53254a (diff)
downloadkernel-common-df7976797fa9af161690dbf4dee81ed92cdc150f.tar.gz
kernel-common-df7976797fa9af161690dbf4dee81ed92cdc150f.tar.bz2
kernel-common-df7976797fa9af161690dbf4dee81ed92cdc150f.zip
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 60d91f76c2fd..6a5bdad524af 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 0
SUBLEVEL = 0
-EXTRAVERSION = -rc7
+EXTRAVERSION =
NAME = Sneaky Weasel
# *DOCUMENTATION*