Merge tag 'clk-for-linus-3.10' of git://git.linaro.org/people/mturquette/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 3b3b0194adfe9867d9f7cdafd9ad1a2c10096cfd..4d1919bf23322ac2209eb3046bfce404c5ced483 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -49,6 +49,7 @@ samsung       Samsung Semiconductor
 sbs    Smart Battery System
 schindler      Schindler
 sil    Silicon Image
+silabs Silicon Laboratories
 simtek
 sirf   SiRF Technology, Inc.
 snps   Synopsys, Inc.