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

[linux-drm-fsl-dcu.git] / Documentation / devicetree / bindings / vendor-prefixes.txt

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 18626965159e06447b369a7f931075f8570c32c7..ecc6a6cd26c198ff412ce2af839cc3b602d73a29 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -34,6 +34,7 @@ powervr       Imagination Technologies
 qcom   Qualcomm, Inc.
 ramtron        Ramtron International
 samsung        Samsung Semiconductor
+sbs    Smart Battery System
 schindler      Schindler
 sil    Silicon Image
 simtek
@@ -41,4 +42,5 @@ sirf  SiRF Technology, Inc.
 st     STMicroelectronics
 stericsson     ST-Ericsson
 ti     Texas Instruments
+wlf    Wolfson Microelectronics
 xlnx   Xilinx