summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-23 16:04:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-23 16:04:07 -0700
commita474902cf5c43465f88afbdfb4bd759205ef74aa (patch)
tree899a32b2b8f09558ff5bd65d9e9c376df83acce3 /Documentation
parentc2468d32f5a57298b732826af84cdc39745d179c (diff)
parentcf9e2368655d86cd800e4d9fe65a407b39d29373 (diff)
downloadop-kernel-dev-a474902cf5c43465f88afbdfb4bd759205ef74aa.zip
op-kernel-dev-a474902cf5c43465f88afbdfb4bd759205ef74aa.tar.gz
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
Pull device tree bug fixes and maintainership updates from Grant Likely: "This branch contains a couple of minor bug fixes and documentation additions, but the bulk of it are several changes to the MAINTAINERS file regarding the subsystems I've been involved with" * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: of/irq: init struct resource to 0 in of_irq_to_resource() of/irq: Avoid calling list_first_entry() for empty list of: add vendor prefixes for hisilicon of: add vendor prefix for Qualcomm Atheros, Inc. MAINTAINERS: Fix incorrect status tag MAINTAINERS: Refactor device tree maintainership MAINTAINERS: Change device tree mailing list MAINTAINERS: Remove Grant Likely
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index d5a79ca..366ce9b 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -26,6 +26,7 @@ est ESTeem Wireless Modems
fsl Freescale Semiconductor
GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc.
gef GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+hisilicon Hisilicon Limited.
hp Hewlett Packard
ibm International Business Machines (IBM)
idt Integrated Device Technologies, Inc.
@@ -43,6 +44,7 @@ nxp NXP Semiconductors
onnn ON Semiconductor Corp.
picochip Picochip Ltd
powervr PowerVR (deprecated, use img)
+qca Qualcomm Atheros, Inc.
qcom Qualcomm, Inc.
ralink Mediatek/Ralink Technology Corp.
ramtron Ramtron International
OpenPOWER on IntegriCloud