Merge tag 'dlm-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[~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 9de2b9ff9d6ed6067e31c7fbe1533eb1f4a738f3..770a0193ca1b21280749b7a66ce782312ac5842b 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -5,6 +5,7 @@ using them to avoid name-space collisions.
 
 ad     Avionic Design GmbH
 adi    Analog Devices, Inc.
+ak     Asahi Kasei Corp.
 amcc   Applied Micro Circuits Corporation (APM, formally AMCC)
 apm    Applied Micro Circuits Corporation (APM)
 arm    ARM Ltd.
@@ -25,6 +26,7 @@ gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 hp     Hewlett Packard
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
+img    Imagination Technologies Ltd.
 intercontrol   Inter Control Group
 linux  Linux-specific binding
 marvell        Marvell Technology Group Ltd.
@@ -34,8 +36,9 @@ national      National Semiconductor
 nintendo       Nintendo
 nvidia NVIDIA
 nxp    NXP Semiconductors
+onnn   ON Semiconductor Corp.
 picochip       Picochip Ltd
-powervr        Imagination Technologies
+powervr        PowerVR (deprecated, use img)
 qcom   Qualcomm, Inc.
 ramtron        Ramtron International
 realtek Realtek Semiconductor Corp.
@@ -45,6 +48,7 @@ schindler     Schindler
 sil    Silicon Image
 simtek
 sirf   SiRF Technology, Inc.
+snps   Synopsys, Inc.
 st     STMicroelectronics
 stericsson     ST-Ericsson
 ti     Texas Instruments