Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[mirror_ubuntu-disco-kernel.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 69183f0fbc7873f13e9b4516a34e3dde41686ab7..1ea1fd4232ab2ac9c0e736169ef98a02e05ccf8b 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -361,6 +361,7 @@ variscite   Variscite Ltd.
 via    VIA Technologies, Inc.
 virtio Virtual I/O Device Specification, developed by the OASIS consortium
 vivante        Vivante Corporation
+vocore VoCore Studio
 voipac Voipac Technologies s.r.o.
 wd     Western Digital Corp.
 wetek  WeTek Electronics, limited.