Merge tag 'led-fix-for-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 2c3fc512e7466fe0d7577db7d7c74b803739585c..376f24484182bfee84ad692dd483490f680b1cfb 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -127,6 +127,7 @@ everspin    Everspin Technologies, Inc.
 exar   Exar Corporation
 excito Excito
 ezchip EZchip Semiconductor
+facebook       Facebook
 fairphone      Fairphone B.V.
 faraday        Faraday Technology Corporation
 fastrax        Fastrax Oy
@@ -235,6 +236,7 @@ micrel      Micrel Inc.
 microchip      Microchip Technology Inc.
 microcrystal   Micro Crystal AG
 micron Micron Technology Inc.
+mikroe         MikroElektronika d.o.o.
 minix  MINIX Technology Ltd.
 miramems       MiraMEMS Sensing Technology Co., Ltd.
 mitsubishi     Mitsubishi Electric Corporation
@@ -274,6 +276,7 @@ nxp NXP Semiconductors
 okaya  Okaya Electric America, Inc.
 oki    Oki Electric Industry Co., Ltd.
 olimex OLIMEX Ltd.
+olpc   One Laptop Per Child
 onion  Onion Corporation
 onnn   ON Semiconductor Corp.
 ontat  On Tat Industrial Company