summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-08 08:36:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-08 08:36:40 -0700
commit31e918908ccaf2b651ed8f666120f2a03a97193f (patch)
tree39aab36ced1932d06cb2e3cee037faae0b94a63b /Makefile
parentae3759c2573031f1306496c6f9f32f20e86f03aa (diff)
parent31880c37c11e28cb81c70757e38392b42e695dc6 (diff)
downloadlinux-31e918908ccaf2b651ed8f666120f2a03a97193f.tar.gz
linux-31e918908ccaf2b651ed8f666120f2a03a97193f.tar.bz2
linux-31e918908ccaf2b651ed8f666120f2a03a97193f.zip
Merge 3.9-rc6 into usb-next
We want the fixes here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 58a165b02af1..6db672b15bda 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 9
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = Unicycling Gorilla
# *DOCUMENTATION*