Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-microblaze.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 6ec1a02..60f5676 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -15,6 +15,7 @@ adi   Analog Devices, Inc.
 advantech      Advantech Corporation
 aeroflexgaisler        Aeroflex Gaisler AB
 al     Annapurna Labs
+allo   Allo.com
 allwinner      Allwinner Technology Co., Ltd.
 alphascale     AlphaScale Integrated Circuits Systems, Inc.
 altr   Altera Corp.
@@ -306,6 +307,7 @@ seagate     Seagate Technology PLC
 semtech        Semtech Corporation
 sensirion      Sensirion AG
 sff    Small Form Factor Committee
+sgd    Solomon Goldentek Display Corporation
 sgx    SGX Sensortech
 sharp  Sharp Corporation
 shimafuji      Shimafuji Electric, Inc.