Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next

[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 42adb4101cc6b0eb53ddf5ccf74748606276cbd8..86740d4a270d39c8d3fd3c97f16faeb96a2960ce 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -10,6 +10,7 @@ ad    Avionic Design GmbH
 adapteva       Adapteva, Inc.
 adh    AD Holdings Plc.
 adi    Analog Devices, Inc.
+advantech      Advantech Corporation
 aeroflexgaisler        Aeroflex Gaisler AB
 al     Annapurna Labs
 allwinner      Allwinner Technology Co., Ltd.
@@ -89,6 +90,7 @@ fcs   Fairchild Semiconductor
 firefly        Firefly
 focaltech      FocalTech Systems Co.,Ltd
 fsl    Freescale Semiconductor
+ge     General Electric Company
 GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 geniatech      Geniatech, Inc.