summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-14 23:39:23 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-14 23:39:23 (GMT)
commit919ba4ee1badf6247f8064bdec2c80e389b57c40 (patch)
treee18a358f60e67901093f91a300bbf7b7a6e4d543 /Makefile
parent06087cb42dc1da096c37f51ea12ad676f00569a9 (diff)
parent04f9c6e6d17584340fb6c8a9469a0e6df28876d2 (diff)
downloadlinux-919ba4ee1badf6247f8064bdec2c80e389b57c40.tar.xz
Merge tag 'usb-serial-3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v3.18-rc5 Here are a few fixes for reported problems including a possible null-deref on probe with keyspan, a misbehaving modem, and a couple of issues with the USB console. Some new device IDs are also added. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b1c3254..ef748e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 19
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Diseased Newt
# *DOCUMENTATION*