resolved conflicts for merge of 20f410a4 to master

Change-Id: I187f29848c223c8c548323e0fa20ea0f3b8a3909
2010-01-28 07:38:15 -08:00 · 2010-01-28 07:38:15 -08:00 · 2f3d96ee5b
parent 9aa6b04533 20f410a418
commit 2f3d96ee5b
1 changed files with 1 additions and 0 deletions
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@ -152,6 +152,7 @@ int match_fastboot(usb_ifc_info *info)
       (info->dev_vendor != 0x0502) &&
       (info->dev_vendor != 0x22b8) &&  // Motorola
       (info->dev_vendor != 0x0955) &&  // Nvidia
+       (info->dev_vendor != 0x413c) &&  // DELL
       (info->dev_vendor != 0x0bb4))    // HTC
            return -1;
    if(info->ifc_class != 0xff) return -1;