resolved conflicts for merge of 20f410a to master

Change-Id: I187f29848c223c8c548323e0fa20ea0f3b8a3909
yoannsculo · Jan 28, 2010 · 2f3d96e · 2f3d96e
2 parents 9aa6b04 + 20f410a
commit 2f3d96e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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;