summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-06-08 20:05:18 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-06-08 20:05:18 -0400
commit44b56603c4c476b845a824cff6fe905c6268b2a1 (patch)
treeb7e792414fef2390718a657765719fbbb529ce84 /Makefile
parentc3935e30495869dd611e1cd62253c94ebc7c6c04 (diff)
parentb160fdabe93a8a53094f90f02bf4dcb500782aab (diff)
downloadlinux-3.10-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.gz
linux-3.10-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.bz2
linux-3.10-44b56603c4c476b845a824cff6fe905c6268b2a1.zip
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5f05f8cbeda..ebc8225f7a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 34
-EXTRAVERSION = -rc6
+EXTRAVERSION =
NAME = Sheep on Meth
# *DOCUMENTATION*