Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[cascardo/linux.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 69b0576..77e985f 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -36,6 +36,7 @@ aspeed        ASPEED Technology Inc.
 atlas  Atlas Scientific LLC
 atmel  Atmel Corporation
 auo    AU Optronics Corporation
+auvidea Auvidea GmbH
 avago  Avago Technologies
 avic   Shanghai AVIC Optoelectronics Co., Ltd.
 axis   Axis Communications AB
@@ -75,6 +76,7 @@ digilent      Diglent, Inc.
 dlg    Dialog Semiconductor
 dlink  D-Link Corporation
 dmo    Data Modul AG
+domintech      Domintech Co., Ltd.
 dptechnics     DPTechnics
 dragino        Dragino Technology Co., Limited
 ea     Embedded Artists AB
@@ -85,6 +87,7 @@ elan  Elan Microelectronic Corp.
 embest Shenzhen Embest Technology Co., Ltd.
 emmicro        EM Microelectronic
 energymicro    Silicon Laboratories (formerly Energy Micro AS)
+engicam        Engicam S.r.l.
 epcos  EPCOS AG
 epfl   Ecole Polytechnique Fédérale de Lausanne
 epson  Seiko Epson Corp.
@@ -138,8 +141,10 @@ iom        Iomega Corporation
 isee   ISEE 2007 S.L.
 isil   Intersil
 issi   Integrated Silicon Solutions Inc.
+jdi    Japan Display Inc.
 jedec  JEDEC Solid State Technology Association
 karo   Ka-Ro electronics GmbH
+keithkoep      Keith & Koep GmbH
 keymile        Keymile GmbH
 kinetic Kinetic Technologies
 kosagi Sutajio Ko-Usagi PTE Ltd.
@@ -234,6 +239,7 @@ sigma       Sigma Designs, Inc.
 sii    Seiko Instruments, Inc.
 sil    Silicon Image
 silabs Silicon Laboratories
+silead Silead Inc.
 silergy        Silergy Corp.
 siliconmitus   Silicon Mitus, Inc.
 simtek
@@ -254,7 +260,10 @@ starry     Starry Electronic Technology (ShenZhen) Co., LTD
 startek        Startek
 ste    ST-Ericsson
 stericsson     ST-Ericsson
+summit Summit microelectronics
+sunchip        Shenzhen Sunchip Technology Co., Ltd
 SUNW   Sun Microsystems, Inc
+swir   Sierra Wireless
 syna   Synaptics Inc.
 synology       Synology, Inc.
 tbs    TBS Technologies
@@ -265,6 +274,7 @@ technologic Technologic Systems
 thine  THine Electronics, Inc.
 ti     Texas Instruments
 tlm    Trusted Logic Mobility
+topeet  Topeet
 toradex        Toradex AG
 toshiba        Toshiba Corporation
 toumaz Toumaz