summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 23:02:38 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 23:02:38 +0400
commit1508124d8a4e0995362d93d82e5555a74bfc998f (patch)
tree62b36e0fa03b40e68be6941c5139e8ff7653d0b2 /Makefile
parent976f8bef9cfb5246bc0e8dc781562daa79cb7aaf (diff)
parent7d132055814ef17a6c7b69f342244c410a5e000f (diff)
downloadlinux-1508124d8a4e0995362d93d82e5555a74bfc998f.tar.xz
Merge 3.10-rc6 into usb-next
We want the fixes in this branch 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 90400165125e..c6863b55f7c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 10
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = Unicycling Gorilla
# *DOCUMENTATION*