Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

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

2 files changed, 1 insertions, 26 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index bb2e37f7db26..18f4e62aaa75 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -996,7 +996,7 @@ static int acm_probe(struct usb_interface *intf,
                 case USB_CDC_CALL_MANAGEMENT_TYPE:
                         call_management_function = buffer[3];
                         call_interface_num = buffer[4];
-                        if ( (quirks & NOT_A_MODEM) == 0 && (call_management_function & 3) != 3)
+                        if ((quirks & NOT_A_MODEM) == 0 && (call_management_function & 3) != 3)
                                 dev_err(&intf->dev, "This device cannot do calls on its own. It is not a modem.\n");
                         break;
                 default:
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index ee469274a3fe..65a55abb791f 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -32,8 +32,6 @@
 #define DRIVER_AUTHOR "Oliver Neukum"
 #define DRIVER_DESC "USB Abstract Control Model driver for USB WCM Device Management"
 
-#define HUAWEI_VENDOR_ID        0x12D1
-
 static const struct usb_device_id wdm_ids[] = {
         {
                 .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS |
@@ -41,29 +39,6 @@ static const struct usb_device_id wdm_ids[] = {
                 .bInterfaceClass = USB_CLASS_COMM,
                 .bInterfaceSubClass = USB_CDC_SUBCLASS_DMM
         },
-        {
-                /* 
-                 * Huawei E392, E398 and possibly other Qualcomm based modems
-                 * embed the Qualcomm QMI protocol inside CDC on CDC ECM like
-                 * control interfaces.  Userspace access to this is required
-                 * to configure the accompanying data interface
-                 */
-                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR |
-                                        USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = HUAWEI_VENDOR_ID,
-                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
-                .bInterfaceSubClass = 1,
-                .bInterfaceProtocol = 9, /* NOTE: CDC ECM control interface! */
-        },
-        {
-                 /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
-                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR |
-                                      USB_DEVICE_ID_MATCH_INT_INFO,
-                .idVendor           = HUAWEI_VENDOR_ID,
-                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
-                .bInterfaceSubClass = 1,
-                .bInterfaceProtocol = 57, /* NOTE: CDC ECM control interface! */
-        },
         { }
 };