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 98271503f0063c0d8b5e63276ac30a30e6f0aef2..770a0193ca1b21280749b7a66ce782312ac5842b 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -26,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.
@@ -37,7 +38,7 @@ 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.