Merge tag 'armsoc-tee' 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 ee55847..12e2784 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -139,6 +139,7 @@ holt        Holt Integrated Circuits, Inc.
 honeywell      Honeywell
 hp     Hewlett Packard
 holtek Holtek Semiconductor, Inc.
+hwacom HwaCom Systems Inc.
 i2se   I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
@@ -162,6 +163,7 @@ jedec       JEDEC Solid State Technology Association
 karo   Ka-Ro electronics GmbH
 keithkoep      Keith & Koep GmbH
 keymile        Keymile GmbH
+khadas Khadas
 kinetic Kinetic Technologies
 kosagi Sutajio Ko-Usagi PTE Ltd.
 kyo    Kyocera Corporation
@@ -171,6 +173,7 @@ lego        LEGO Systems A/S
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
 licheepi       Lichee Pi
+linaro Linaro Limited
 linux  Linux-specific binding
 lltc   Linear Technology Corporation
 lsi    LSI Corp. (LSI Logic)