Merge 4.8-rc3 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Aug 2016 01:33:17 +0000 (21:33 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Aug 2016 01:33:17 +0000 (21:33 -0400)
We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/misc/ftdi-elan.c

Simple merge