diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-01 01:24:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-01 01:24:43 +0100 |
| commit | c290b2f2b0187b5cd840b2c2803107a0207ebc2f (patch) | |
| tree | f4751d34d041e7ed5a30d5c69cdb03de898a6238 /Documentation | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| parent | of: Add Silicon Image vendor prefix (diff) | |
| download | linux-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.tar.xz linux-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.zip | |
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. ramtron Ramtron International samsung Samsung Semiconductor schindler Schindler +sil Silicon Image simtek sirf SiRF Technology, Inc. stericsson ST-Ericsson |