Merge airlied/drm-next into drm-misc-next

[mirror_ubuntu-bionic-kernel.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 52cfd5f97b6b6d505f6411fb89dbac8d704dd738..36b27b1efec675ef38a1fece766ee3c0ef0bd07f 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -227,6 +227,7 @@ nexbox      Nexbox
 newhaven       Newhaven Display International
 ni     National Instruments
 nintendo       Nintendo
+nlt    NLT Technologies, Ltd.
 nokia  Nokia
 nordic Nordic Semiconductor
 nuvoton        Nuvoton Technology Corporation
@@ -248,6 +249,7 @@ oxsemi      Oxford Semiconductor, Ltd.
 panasonic      Panasonic Corporation
 parade Parade Technologies Inc.
 pericom        Pericom Technology Inc.
+pervasive      Pervasive Displays, Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
 pine64 Pine64