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

[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 65274126dfadc6ab0d6cb7839b97225123db30ac..6931c4348d240ed9f8bf6b21a0d75f9c520edf1d 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -5,6 +5,7 @@ using them to avoid name-space collisions.
 
 ad     Avionic Design GmbH
 adi    Analog Devices, Inc.
+aeroflexgaisler        Aeroflex Gaisler AB
 ak     Asahi Kasei Corp.
 amcc   Applied Micro Circuits Corporation (APM, formally AMCC)
 apm    Applied Micro Circuits Corporation (APM)
@@ -49,6 +50,7 @@ samsung       Samsung Semiconductor
 sbs    Smart Battery System
 schindler      Schindler
 sil    Silicon Image
+silabs Silicon Laboratories
 simtek
 sirf   SiRF Technology, Inc.
 snps   Synopsys, Inc.