aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-30 16:24:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-30 16:24:43 -0800
commitc290b2f2b0187b5cd840b2c2803107a0207ebc2f (patch)
treef4751d34d041e7ed5a30d5c69cdb03de898a6238 /Documentation
parentd6e92d360c21494ed4ce3bcfa7c84b90cb075bba (diff)
parente43fce14088d9910b545c30c9a7127deb289d477 (diff)
downloadvexpress-lsk-c290b2f2b0187b5cd840b2c2803107a0207ebc2f.tar.gz
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.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index e8552782b44..874921e9780 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