commit 2f3d96ee5b6ba43b49d0e08c75b9a74b05f37b8b
author Jean-Baptiste Queru <jbq@google.com> Thu Jan 28 07:38:15 2010 -0800
committer Jean-Baptiste Queru <jbq@google.com> Thu Jan 28 07:38:15 2010 -0800
tree 32e34028199dfbc6b260e2204601452f209f8da1
parent 9aa6b0453321cc542d3b0eefd6563b4614292f4d
parent 20f410a41890113de126680518c13cdab359c66d

resolved conflicts for merge of 20f410a4 to master

Change-Id: I187f29848c223c8c548323e0fa20ea0f3b8a3909

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 2a96679..aedfce1 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -152,6 +152,7 @@
        (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;