summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/vendor-prefixes.txt
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2014-11-19 12:00:29 +0800
committerShawn Guo <shawn.guo@linaro.org>2014-11-19 12:00:29 +0800
commit754827b37297eb2ab36bb6f74040caac7f0aa01d (patch)
treee5e8471e690123c5953098d084df044b00f52f4e /Documentation/devicetree/bindings/vendor-prefixes.txt
parentd1176a6a73c9114e008e5ada84bbf41872b735d4 (diff)
parentc95e259674da685152eb093263478c7ada0aa904 (diff)
Merge branch 'imx/dt' into for-next
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 723999d73744..776f4af2155d 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -146,6 +146,7 @@ st STMicroelectronics
ste ST-Ericsson
stericsson ST-Ericsson
synology Synology, Inc.
+tbs TBS Technologies
thine THine Electronics, Inc.
ti Texas Instruments
tlm Trusted Logic Mobility