Merge tag 'devicetree-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[karo-tx-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 316412dc79135a472886a331caa9ff4a22932bfe..32f965807a07e42d0c1f47d2f7e6da7eceb5972c 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -28,6 +28,7 @@ aptina        Aptina Imaging
 arasan Arasan Chip Systems
 arm    ARM Ltd.
 armadeus       ARMadeus Systems SARL
+arrow  Arrow Electronics
 artesyn        Artesyn Embedded Technologies Inc.
 asahi-kasei    Asahi Kasei Corp.
 aspeed ASPEED Technology Inc.
@@ -60,6 +61,7 @@ cnxt  Conexant Systems, Inc.
 compulab       CompuLab Ltd.
 cortina        Cortina Systems, Inc.
 cosmic Cosmic Circuits
+creative       Creative Technology Ltd
 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.
 cypress        Cypress Semiconductor Corporation
@@ -79,6 +81,7 @@ ebv   EBV Elektronik
 edt    Emerging Display Technologies
 eeti   eGalax_eMPIA Technology Inc
 elan   Elan Microelectronic Corp.
+embest Shenzhen Embest Technology Co., Ltd.
 emmicro        EM Microelectronic
 energymicro    Silicon Laboratories (formerly Energy Micro AS)
 epcos  EPCOS AG
@@ -124,6 +127,7 @@ idt Integrated Device Technologies, Inc.
 ifi    Ingenieurburo Fur Ic-Technologie (I/F/I)
 iom    Iomega Corporation
 img    Imagination Technologies Ltd.
+inforce        Inforce Computing
 ingenic        Ingenic Semiconductor
 innolux        Innolux Corporation
 intel  Intel Corporation