summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-14 12:30:12 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-14 12:30:12 -0800
commit54d5f88f25c38e5500a17b16240cb3775af00876 (patch)
tree09208d460e2f5aa93f5d2cdbbb2c5972758994ea /Makefile
parent76cc43868c1e9d6344ad6c4992c4f6abd5204a8f (diff)
parent77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff)
Merge v3.7-rc5 into tty-next
This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 42d0e56818e..6edac73ee1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 7
SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc5
NAME = Terrified Chipmunk
# *DOCUMENTATION*