diff options
| author | Rob Herring <robh@kernel.org> | 2020-10-06 16:38:32 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2020-10-06 16:38:32 +0300 |
| commit | aa6174f0d31e4d5785a843fc79a433bed7cac784 (patch) | |
| tree | af3634259876c4986ef4fde2972e40c8d0f1068a /Documentation/devicetree/bindings/vendor-prefixes.yaml | |
| parent | 1b25b207d207f2bdbc7aeff81426e6a0428a6012 (diff) | |
| parent | efe84d408bf41975db8506d3a1cc02e794e2309c (diff) | |
| download | linux-aa6174f0d31e4d5785a843fc79a433bed7cac784.tar.xz | |
Merge branch 'dt/linus' into dt/next
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 844c25a24818..d36e309b7d76 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -1001,7 +1001,7 @@ patternProperties: "^sst,.*": description: Silicon Storage Technology, Inc. "^sstar,.*": - description: Xiamen Xingchen(SigmaStar) Technology Co., Ltd. + description: Xiamen Xingchen(SigmaStar) Technology Co., Ltd. (formerly part of MStar Semiconductor, Inc.) "^st,.*": description: STMicroelectronics |