---

yaml --- r: 233563 b: refs/heads/master c: 72a012c h: refs/heads/master i: 233561: bdc8463 233559: 4b20132 v: v3
git-mirror · Feb 17, 2011 · 26d7196 · 26d7196
1 parent cd7f5ac
commit 26d7196
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acb52cb1613e1d3c8a8c650717cc51965c60d7d4
+refs/heads/master: 72a012ce0a02c6c616676a24b40ff81d1aaeafda
diff --git a/trunk/drivers/usb/core/quirks.c b/trunk/drivers/usb/core/quirks.c
@@ -48,6 +48,10 @@ static const struct usb_device_id usb_quirk_list[] = {
 	{ USB_DEVICE(0x04b4, 0x0526), .driver_info =
 			USB_QUIRK_CONFIG_INTF_STRINGS },
 
+	/* Samsung Android phone modem - ID conflict with SPH-I500 */
+	{ USB_DEVICE(0x04e8, 0x6601), .driver_info =
+			USB_QUIRK_CONFIG_INTF_STRINGS },
+
 	/* Roland SC-8820 */
 	{ USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },