Merge tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm

[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 2afaa63..f32b798 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -42,6 +42,7 @@ arrow Arrow Electronics
 artesyn        Artesyn Embedded Technologies Inc.
 asahi-kasei    Asahi Kasei Corp.
 aspeed ASPEED Technology Inc.
+asus   AsusTek Computer Inc.
 atlas  Atlas Scientific LLC
 atmel  Atmel Corporation
 auo    AU Optronics Corporation
@@ -54,6 +55,7 @@ axentia       Axentia Technologies AB
 axis   Axis Communications AB
 bananapi BIPAI KEJI LIMITED
 bhf    Beckhoff Automation GmbH & Co. KG
+bitmain        Bitmain Technologies
 boe    BOE Technology Group Co., Ltd.
 bosch  Bosch Sensortec GmbH
 boundary       Boundary Devices Inc.
@@ -399,6 +401,7 @@ v3  V3 Semiconductor
 variscite      Variscite Ltd.
 via    VIA Technologies, Inc.
 virtio Virtual I/O Device Specification, developed by the OASIS consortium
+vitesse        Vitesse Semiconductor Corporation
 vivante        Vivante Corporation
 vocore VoCore Studio
 voipac Voipac Technologies s.r.o.
@@ -416,6 +419,7 @@ xes Extreme Engineering Solutions (X-ES)
 xillybus       Xillybus Ltd.
 xlnx   Xilinx
 xunlong        Shenzhen Xunlong Software CO.,Limited
+ysoft  Y Soft Corporation a.s.
 zarlink        Zarlink Semiconductor
 zeitec ZEITEC Semiconductor Co., LTD.
 zidoo  Shenzhen Zidoo Technology Co., Ltd.