diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:47:56 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:47:56 +1100 |
| commit | c320d64f16f365cfac044a595434bcaff4bee657 (patch) | |
| tree | 7a6c1833f3b21cd27ee01e7d968bea57c467cbd5 /Documentation | |
| parent | 5d7fcc09427100cc0e75b93bdc651ee0901e2675 (diff) | |
| parent | 7f60466de9a442ca6d4734eeb91435e331472736 (diff) | |
Merge remote-tracking branch 'dt-rh/for-next'
Conflicts:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/powerpc/include/asm/prom.h
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 8319844fb68d..d504cb6a3067 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -16,6 +16,7 @@ avago Avago Technologies bosch Bosch Sensortec GmbH brcm Broadcom Corporation cavium Cavium, Inc. +cdns Cadence Design Systems Inc. chrp Common Hardware Reference Platform cirrus Cirrus Logic, Inc. cortina Cortina Systems, Inc. @@ -46,6 +47,7 @@ nintendo Nintendo nvidia NVIDIA nxp NXP Semiconductors onnn ON Semiconductor Corp. +phytec PHYTEC Messtechnik GmbH picochip Picochip Ltd powervr PowerVR (deprecated, use img) qca Qualcomm Atheros, Inc. @@ -65,13 +67,13 @@ snps Synopsys, Inc. st STMicroelectronics ste ST-Ericsson stericsson ST-Ericsson -toumaz Toumaz ti Texas Instruments toshiba Toshiba Corporation +toumaz Toumaz v3 V3 Semiconductor via VIA Technologies, Inc. voipac Voipac Technologies s.r.o. +winbond Winbond Electronics corp. wlf Wolfson Microelectronics wm Wondermedia Technologies, Inc. -winbond Winbond Electronics corp. xlnx Xilinx |