Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 56a6d4e79383f950ea068aff45041af04c9def69..ac5f0c34ae00a712b0d78ed4cc92fa88dd5491a6 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -55,6 +55,7 @@ cortina       Cortina Systems, Inc.
 cosmic Cosmic Circuits
 crystalfontz   Crystalfontz America, Inc.
 cubietech      Cubietech, Ltd.
+cypress        Cypress Semiconductor Corporation
 dallas Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom        DAVICOM Semiconductor, Inc.
 delta  Delta Electronics, Inc.
@@ -111,6 +112,7 @@ ingenic     Ingenic Semiconductor
 innolux        Innolux Corporation
 intel  Intel Corporation
 intercontrol   Inter Control Group
+invensense     InvenSense Inc.
 isee   ISEE 2007 S.L.
 isil   Intersil
 jedec  JEDEC Solid State Technology Association
@@ -143,6 +145,7 @@ mundoreader Mundo Reader S.L.
 murata Murata Manufacturing Co., Ltd.
 mxicy  Macronix International Co., Ltd.
 national       National Semiconductor
+nec    NEC LCD Technologies, Ltd.
 neonode                Neonode Inc.
 netgear        NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)
@@ -150,10 +153,13 @@ netxeon           Shenzhen Netxeon Technology CO., LTD
 newhaven       Newhaven Display International
 nintendo       Nintendo
 nokia  Nokia
+nuvoton        Nuvoton Technology Corporation
 nvidia NVIDIA
 nxp    NXP Semiconductors
+okaya  Okaya Electric America, Inc.
 onnn   ON Semiconductor Corp.
 opencores      OpenCores.org
+option Option NV
 ortustech      Ortus Technology Co., Ltd.
 ovti   OmniVision Technologies
 panasonic      Panasonic Corporation