Merge branch 'tee/initial-merge' into fixes

[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 f9fe94535b4668e3ac84a746aeca937cd8a8bc0e..12e27844bb7b60d33a04673c27e408f09bfa3887 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -173,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)