Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 83700da22b7970cbc6a0f6a7a3c030921dde4551..bd33a268fd1bfca9e24184a0ce3ad946d1f19d46 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -229,6 +229,7 @@ st  STMicroelectronics
 startek        Startek
 ste    ST-Ericsson
 stericsson     ST-Ericsson
+syna   Synaptics Inc.
 synology       Synology, Inc.
 SUNW   Sun Microsystems, Inc
 tbs    TBS Technologies