diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-30 19:24:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-30 19:24:43 -0500 |
| commit | c290b2f2b0187b5cd840b2c2803107a0207ebc2f (patch) | |
| tree | f4751d34d041e7ed5a30d5c69cdb03de898a6238 /Documentation | |
| parent | d6e92d360c21494ed4ce3bcfa7c84b90cb075bba (diff) | |
| parent | e43fce14088d9910b545c30c9a7127deb289d477 (diff) | |
Merge branch 'dt-for-linus' of git://sources.calxeda.com/kernel/linux
* 'dt-for-linus' of git://sources.calxeda.com/kernel/linux:
of: Add Silicon Image vendor prefix
of/irq: of_irq_init: add check for parent equal to child node
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 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 |