Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 12b5808b82f267fb31aa58f83ac27102d41c4353..5a79aeb620b3a206434bd45bf2410a7ed47db7cb 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -9,6 +9,7 @@ actions Actions Semiconductor Co., Ltd.
 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
 adapteva       Adapteva, Inc.
+adaptrum       Adaptrum, Inc.
 adh    AD Holdings Plc.
 adi    Analog Devices, Inc.
 advantech      Advantech Corporation
@@ -88,6 +89,7 @@ dlg   Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG
 domintech      Domintech Co., Ltd.
+dongwoon       Dongwoon Anatech
 dptechnics     DPTechnics
 dragino        Dragino Technology Co., Limited
 ea     Embedded Artists AB
@@ -196,6 +198,7 @@ mediatek    MediaTek Inc.
 megachips      MegaChips
 melexis        Melexis N.V.
 melfas MELFAS Inc.
+mellanox       Mellanox Technologies
 memsic MEMSIC Inc.
 merrii Merrii Technology Co., Ltd.
 micrel Micrel Inc.
@@ -207,7 +210,7 @@ miramems    MiraMEMS Sensing Technology Co., Ltd.
 mitsubishi     Mitsubishi Electric Corporation
 mosaixtech     Mosaix Technologies, Inc.
 motorola       Motorola, Inc.
-moxa   Moxa
+moxa   Moxa Inc.
 mpl    MPL AG
 mqmaker        mqmaker Inc.
 msi    Micro-Star International Co. Ltd.
@@ -344,6 +347,7 @@ tpo TPO
 tronfy Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited
+tsd    Theobroma Systems Design und Consulting GmbH
 tyan   Tyan Computer Corporation
 ucrobotics     uCRobotics
 udoo   Udoo