diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-02 13:49:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-02 13:49:21 -0500 |
| commit | b3613118eb30a589d971e4eccbbb2a1314f5dfd4 (patch) | |
| tree | 868c1ee59e1b5c19a4f2e43716400d0001a994e5 /Documentation/devicetree | |
| parent | 7505afe28c16a8d386624930a018d0052c75d687 (diff) | |
| parent | 5983fe2b29df5885880d7fa3b91aca306c7564ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'Documentation/devicetree')
| -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 e8552782b440..874921e97802 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
| @@ -33,6 +33,7 @@ qcom Qualcomm, Inc. | |||
| 33 | ramtron Ramtron International | 33 | ramtron Ramtron International |
| 34 | samsung Samsung Semiconductor | 34 | samsung Samsung Semiconductor |
| 35 | schindler Schindler | 35 | schindler Schindler |
| 36 | sil Silicon Image | ||
| 36 | simtek | 37 | simtek |
| 37 | sirf SiRF Technology, Inc. | 38 | sirf SiRF Technology, Inc. |
| 38 | stericsson ST-Ericsson | 39 | stericsson ST-Ericsson |