Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[muen/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 401ed98cab1829f867b9be45af898e0f385308bc..5a79aeb620b3a206434bd45bf2410a7ed47db7cb 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -292,6 +292,7 @@ schindler   Schindler
 seagate        Seagate Technology PLC
 semtech        Semtech Corporation
 sensirion      Sensirion AG
+sff    Small Form Factor Committee
 sgx    SGX Sensortech
 sharp  Sharp Corporation
 si-en  Si-En Technology Ltd.