Merge tag 'v3.19-rc4' into next

[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 b1df0ad1306c73e89a4d4be90ef4892b511b6cf3..38c13dc19983a20aca6deb65e4db72f7b8f4dff7 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -54,6 +54,7 @@ epcos EPCOS AG
 epfl   Ecole Polytechnique Fédérale de Lausanne
 epson  Seiko Epson Corp.
 est    ESTeem Wireless Modems
+ettus  NI Ettus Research
 eukrea  Eukréa Electromatique
 everest        Everest Semiconductor Co. Ltd.
 excito Excito