Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index ec0bfb9bbebd42c828a3b4978db070924275f609..4686f4bdaca060f9bed13c287ec53c99f70a1e9c 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -178,6 +178,7 @@ maxim       Maxim Integrated Products
 mcube  mCube
 meas   Measurement Specialties
 mediatek       MediaTek Inc.
+megachips      MegaChips
 melexis        Melexis N.V.
 melfas MELFAS Inc.
 memsic MEMSIC Inc.