Merge tag 'v4.5' into next

[deliverable/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 72e2c5a2b3278facb20378383cbb63baa6485e0f..656f3dd31f199ec892533cd6d0d9525de3433c86 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -226,6 +226,7 @@ st  STMicroelectronics
 startek        Startek
 ste    ST-Ericsson
 stericsson     ST-Ericsson
+syna   Synaptics Inc.
 synology       Synology, Inc.
 tbs    TBS Technologies
 tcl    Toby Churchill Ltd.