1 files changed, 28 insertions, 2 deletions

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index e6469ec7a90e..b1df0ad1306c 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -14,6 +14,7 @@ allwinner	Allwinner Technology Co., Ltd.
 altr    Altera Corp.
 amcc    Applied Micro Circuits Corporation (APM, formally AMCC)
 amd     Advanced Micro Devices (AMD), Inc.
+amlogic Amlogic, Inc.
 ams     AMS AG
 amstaos AMS-Taos Inc.
 apm     Applied Micro Circuits Corporation (APM)
@@ -29,36 +30,47 @@ calxeda	Calxeda
 capella Capella Microsystems, Inc
 cavium  Cavium, Inc.
 cdns    Cadence Design Systems Inc.
+chipidea        Chipidea, Inc
 chrp    Common Hardware Reference Platform
 chunghwa        Chunghwa Picture Tubes Ltd.
 cirrus  Cirrus Logic, Inc.
+cnm     Chips&Media, Inc.
 cortina Cortina Systems, Inc.
 crystalfontz    Crystalfontz America, Inc.
 dallas  Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom DAVICOM Semiconductor, Inc.
 denx    Denx Software Engineering
 digi    Digi International Inc.
+digilent        Diglent, Inc.
+dlg     Dialog Semiconductor
 dlink   D-Link Corporation
 dmo     Data Modul AG
 ebv     EBV Elektronik
 edt     Emerging Display Technologies
 elan    Elan Microelectronic Corp.
 emmicro EM Microelectronic
+energymicro     Silicon Laboratories (formerly Energy Micro AS)
 epcos   EPCOS AG
 epfl    Ecole Polytechnique Fédérale de Lausanne
 epson   Seiko Epson Corp.
 est     ESTeem Wireless Modems
 eukrea  Eukréa Electromatique
+everest Everest Semiconductor Co. Ltd.
 excito  Excito
+fcs     Fairchild Semiconductor
 fsl     Freescale Semiconductor
 GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef     GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+geniatech       Geniatech, Inc.
 globalscale     Globalscale Technologies, Inc.
 gmt     Global Mixed-mode Technology, Inc.
 google  Google, Inc.
 gumstix Gumstix, Inc.
+gw      Gateworks Corporation
+hannstar        HannStar Display Corporation
 haoyu   Haoyu Microelectronic Co. Ltd.
 hisilicon       Hisilicon Limited.
+hit     Hitachi Ltd.
 honeywell       Honeywell
 hp      Hewlett Packard
 i2se    I2SE GmbH
@@ -66,9 +78,11 @@ ibm	International Business Machines (IBM)
 idt     Integrated Device Technologies, Inc.
 iom     Iomega Corporation
 img     Imagination Technologies Ltd.
+innolux Innolux Corporation
 intel   Intel Corporation
 intercontrol    Inter Control Group
 isee    ISEE 2007 S.L.
+isil    Intersil (deprecated, use isl)
 isl     Intersil
 karo    Ka-Ro electronics GmbH
 keymile Keymile GmbH
@@ -82,11 +96,15 @@ lltc	Linear Technology Corporation
 marvell Marvell Technology Group Ltd.
 maxim   Maxim Integrated Products
 mediatek        MediaTek Inc.
+merrii  Merrii Technology Co., Ltd.
 micrel  Micrel Inc.
 microchip       Microchip Technology Inc.
+micron  Micron Technology Inc.
+mitsubishi      Mitsubishi Electric Corporation
 mosaixtech      Mosaix Technologies, Inc.
 moxa    Moxa
 mpl     MPL AG
+mti     Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader     Mundo Reader S.L.
 murata  Murata Manufacturing Co., Ltd.
 mxicy   Macronix International Co., Ltd.
@@ -101,6 +119,7 @@ nxp	NXP Semiconductors
 onnn    ON Semiconductor Corp.
 opencores       OpenCores.org
 panasonic       Panasonic Corporation
+pericom Pericom Technology Inc.
 phytec  PHYTEC Messtechnik GmbH
 picochip        Picochip Ltd
 plathome        Plat'Home Co., Ltd.
@@ -118,6 +137,7 @@ renesas	Renesas Electronics Corporation
 ricoh   Ricoh Co. Ltd.
 rockchip        Fuzhou Rockchip Electronics Co., Ltd
 samsung Samsung Semiconductor
+sandisk Sandisk Corporation
 sbs     Smart Battery System
 schindler       Schindler
 seagate Seagate Technology PLC
@@ -125,21 +145,26 @@ sil	Silicon Image
 silabs  Silicon Laboratories
 simtek
 sii     Seiko Instruments, Inc.
+silergy Silergy Corp.
 sirf    SiRF Technology, Inc.
+sitronix        Sitronix Technology Corporation
 smsc    Standard Microsystems Corporation
-snps    Synopsys, Inc.
+snps    Synopsys, Inc.
 solidrun        SolidRun
+sony    Sony Corporation
 spansion        Spansion Inc.
 st      STMicroelectronics
 ste     ST-Ericsson
 stericsson      ST-Ericsson
 synology        Synology, Inc.
+tbs     TBS Technologies
+thine   THine Electronics, Inc.
 ti      Texas Instruments
 tlm     Trusted Logic Mobility
 toradex Toradex AG
 toshiba Toshiba Corporation
 toumaz  Toumaz
-usi     Universal Scientifc Industrial Co., Ltd.
+usi     Universal Scientific Industrial Co., Ltd.
 v3      V3 Semiconductor
 variscite       Variscite Ltd.
 via     VIA Technologies, Inc.
@@ -148,6 +173,7 @@ winbond Winbond Electronics corp.
 wlf     Wolfson Microelectronics
 wm      Wondermedia Technologies, Inc.
 xes     Extreme Engineering Solutions (X-ES)
+xillybus        Xillybus Ltd.
 xlnx    Xilinx
 zyxel   ZyXEL Communications Corp.
 zarlink Zarlink Semiconductor