Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 d5d2e1e..24c6f65 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
@@ -99,6 +101,7 @@ ezchip       EZchip Semiconductor
 fcs    Fairchild Semiconductor
 firefly        Firefly
 focaltech      FocalTech Systems Co.,Ltd
+friendlyarm    Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
 ge     General Electric Company
 geekbuying     GeekBuying
@@ -135,6 +138,7 @@ innolux     Innolux Corporation
 intel  Intel Corporation
 intercontrol   Inter Control Group
 invensense     InvenSense Inc.
+inversepath    Inverse Path
 iom    Iomega Corporation
 isee   ISEE 2007 S.L.
 isil   Intersil
@@ -142,6 +146,7 @@ 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.
@@ -277,6 +282,7 @@ toshiba     Toshiba Corporation
 toumaz Toumaz
 tpk    TPK U.S.A. LLC
 tplink TP-LINK Technologies Co., Ltd.
+tpo    TPO
 tronfy Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited