diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-27 19:29:18 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-27 19:29:18 (GMT) |
| commit | d6aa1db3eac37cc92d67c3f66eab1b46d5bb9f7b (patch) | |
| tree | 3dd03684f7436320ec64f9c702b5d057a25dca17 /Documentation | |
| parent | 3b7ce99748f0d006f9d1aa85709872e7b46787f7 (diff) | |
| parent | 02a9547e9b3f10d73fde66f52fc8b2a375a300cd (diff) | |
| download | linux-d6aa1db3eac37cc92d67c3f66eab1b46d5bb9f7b.tar.xz | |
Merge branch 'topic/gtm601' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ics43432
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 80bf96d..66a33ae 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -151,6 +151,7 @@ nvidia NVIDIA nxp NXP Semiconductors onnn ON Semiconductor Corp. opencores OpenCores.org +option Option NV ortustech Ortus Technology Co., Ltd. ovti OmniVision Technologies panasonic Panasonic Corporation |