Merge tag 'char-misc-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[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 8f574c778290c29273a78e400ed9b1a503ed4e8f..542bbf304f13420bb9b984632fce587b1f0250fa 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -154,6 +154,7 @@ geniatech   Geniatech, Inc.
 giantec        Giantec Semiconductor, Inc.
 giantplus      Giantplus Technology Co., Ltd.
 globalscale    Globalscale Technologies, Inc.
+globaltop      GlobalTop Technology, Inc.
 gmt    Global Mixed-mode Technology, Inc.
 goodix Shenzhen Huiding Technology Co., Ltd.
 google Google, Inc.