[Automatic update for 2016-08-14]

[metze/wireshark/wip.git] / epan / dissectors / usb.c

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 0e7609f26f3b1918d9e6a510c176f7b5676f1a98..b9e4cbde9ee433547f210eecb24b8a881c9335e1 100644 (file)
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2880,6 +2880,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x2a03, "dog hunter AG" },
     { 0x2a37, "RTD Embedded Technologies, Inc." },
     { 0x2a45, "Meizu Corp." },
+    { 0x2b24, "KeepKey LLC" },
     { 0x2c02, "Planex Communications" },
     { 0x2c1a, "Dolphin Peripherals" },
     { 0x2fb2, "Fujitsu, Ltd" },
@@ -18521,6 +18522,7 @@ static const value_string usb_products_vals[] = {
     { 0x2a45200b, "MX Phone (PTP)" },
     { 0x2a45200c, "MX Phone (PTP & ADB)" },
     { 0x2a452012, "MX Phone (MTP & ACM)" },
+    { 0x2b240001, "Bitcoin hardware wallet" },
     { 0x2c0214ea, "GW-US11H WLAN" },
     { 0x2c1a0000, "Wireless Optical Mouse" },
     { 0x31250001, "TrackerPod Camera Stand" },