Merge tag 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx into next/dt

[karo-tx-linux.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index a8708c783bc2b831c7dee60076d8b8ec780e5c09..4257f3f98c3d03fe1c709f0e76f4ea5389863c08 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -72,6 +72,7 @@ karo  Ka-Ro electronics GmbH
 keymile        Keymile GmbH
 lacie  LaCie
 lantiq Lantiq Semiconductor
+lenovo Lenovo Group Ltd.
 lg     LG Corporation
 linux  Linux-specific binding
 lsi    LSI Corp. (LSI Logic)
@@ -123,6 +124,7 @@ sii Seiko Instruments, Inc.
 sirf   SiRF Technology, Inc.
 smsc   Standard Microsystems Corporation
 snps   Synopsys, Inc.
+solidrun       SolidRun
 spansion       Spansion Inc.
 st     STMicroelectronics
 ste    ST-Ericsson