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

[~andy/linux] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index f29cd78b6698abecbeb801408e4fad7d42e5c347..5780ffcd79af62ae1629c06199d1778c74eaa884 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -27,19 +27,25 @@ cortina     Cortina Systems, Inc.
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 denx   Denx Software Engineering
+edt    Emerging Display Technologies
 emmicro        EM Microelectronic
+epfl   Ecole Polytechnique Fédérale de Lausanne
 epson  Seiko Epson Corp.
 est    ESTeem Wireless Modems
 fsl    Freescale Semiconductor
 GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gmt    Global Mixed-mode Technology, Inc.
+gumstix        Gumstix, Inc.
+haoyu  Haoyu Microelectronic Co. Ltd.
 hisilicon      Hisilicon Limited.
 hp     Hewlett Packard
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
 img    Imagination Technologies Ltd.
 intercontrol   Inter Control Group
+isl    Intersil
+karo   Ka-Ro electronics GmbH
 lg     LG Corporation
 linux  Linux-specific binding
 lsi    LSI Corp. (LSI Logic)
@@ -62,6 +68,7 @@ ralink        Mediatek/Ralink Technology Corp.
 ramtron        Ramtron International
 realtek Realtek Semiconductor Corp.
 renesas        Renesas Electronics Corporation
+rockchip       Fuzhou Rockchip Electronics Co., Ltd
 samsung        Samsung Semiconductor
 sbs    Smart Battery System
 schindler      Schindler
@@ -74,6 +81,7 @@ st    STMicroelectronics
 ste    ST-Ericsson
 stericsson     ST-Ericsson
 ti     Texas Instruments
+tlm    Trusted Logic Mobility
 toshiba        Toshiba Corporation
 toumaz Toumaz
 v3     V3 Semiconductor