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

[linux-2.6-microblaze.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 953aa8f..56a6d4e 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -46,6 +46,7 @@ chipone               ChipOne
 chipspark      ChipSPARK
 chrp   Common Hardware Reference Platform
 chunghwa       Chunghwa Picture Tubes Ltd.
 chipspark      ChipSPARK
 chrp   Common Hardware Reference Platform
 chunghwa       Chunghwa Picture Tubes Ltd.

+ciaa   Computadora Industrial Abierta Argentina

 cirrus Cirrus Logic, Inc.
 cloudengines   Cloud Engines, Inc.
 cnm    Chips&Media, Inc.
 cirrus Cirrus Logic, Inc.
 cloudengines   Cloud Engines, Inc.
 cnm    Chips&Media, Inc.


@@ -136,6 +137,7 @@ mitsubishi  Mitsubishi Electric Corporation
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
 mpl    MPL AG
 mosaixtech     Mosaix Technologies, Inc.
 moxa   Moxa
 mpl    MPL AG

+msi    Micro-Star International Co. Ltd.

 mti    Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader    Mundo Reader S.L.
 murata Murata Manufacturing Co., Ltd.
 mti    Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
 mundoreader    Mundo Reader S.L.
 murata Murata Manufacturing Co., Ltd.


@@ -144,6 +146,7 @@ national    National Semiconductor
 neonode                Neonode Inc.
 netgear        NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)
 neonode                Neonode Inc.
 netgear        NETGEAR
 netlogic       Broadcom Corporation (formerly NetLogic Microsystems)

+netxeon                Shenzhen Netxeon Technology CO., LTD

 newhaven       Newhaven Display International
 nintendo       Nintendo
 nokia  Nokia
 newhaven       Newhaven Display International
 nintendo       Nintendo
 nokia  Nokia