Merge branch 'usb-linus' into usb-next

This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/serial/option.c
index 6cb40ec5253249d1bc18eaf740a56ebe2107dbc7,e668a2460bd456a80ef2140f8c2693172d58ad1a..6ff37e67adfa7515a948483e929673547f7dbefb
--- 1/drivers/usb/serial/option.c
--- 2/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -1422,8 -1417,9 +1420,8 @@@ static void option_instat_callback(stru
  static int option_send_setup(struct usb_serial_port *port)
  {
        struct usb_serial *serial = port->serial;
 -      struct usb_wwan_intf_private *intfdata =
 -              (struct usb_wwan_intf_private *) serial->private;
 +      struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
-       struct option_port_private *portdata;
+       struct usb_wwan_port_private *portdata;
        int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
        int val = 0;
  

diff --cc include/linux/usb/hcd.h
Simple merge