commit 1a2f32c4828380ca8590cf664725650ef35f1e37
author Colin Cross <ccross@android.com> Thu Mar 01 22:55:17 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 01 22:55:17 2012 -0800
tree b89089e1e4f1982487460888f61c52544adc2af8
parent 25443f80a27c6153c3406b4443fd07442e410a57
parent d39f9d93788ed08f8e90d04bdac798e3f3595889

am d39f9d93: am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"

* commit 'd39f9d93788ed08f8e90d04bdac798e3f3595889':
  Fix typo in queue_property_triggers ident

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index fb7ac4d..8610ca1 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -159,6 +159,7 @@
        (info->dev_vendor != 0x0955) &&  // Nvidia
        (info->dev_vendor != 0x413c) &&  // DELL
        (info->dev_vendor != 0x2314) &&  // INQ Mobile
+       (info->dev_vendor != 0x0b05) &&  // Asus
        (info->dev_vendor != 0x0bb4))    // HTC
             return -1;
     if(info->ifc_class != 0xff) return -1;