diff options
| author | Olof Johansson <olof@lixom.net> | 2015-11-10 01:35:19 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-11-10 01:35:19 +0100 |
| commit | 3e4dda70cc989a4f8079541972942609229e9f55 (patch) | |
| tree | 0342db762349057fd2e1efb621ba265df187f1dc /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | ARM: dts: uniphier: add system-bus-controller nodes (diff) | |
| parent | Merge branch 'for-upstream/juno-pcie' of git://linux-arm.org/linux-ld into ne... (diff) | |
| download | linux-3e4dda70cc989a4f8079541972942609229e9f55.tar.xz linux-3e4dda70cc989a4f8079541972942609229e9f55.zip | |
Merge branch 'next/arm64' into next/dt
Merging in the few patches I had kept separate from main next/dt, since others
got merged here directly.
* next/arm64:
arm64: defconfig: Enable PCI generic host bridge by default
arm64: Juno: Add support for the PCIe host bridge on Juno R1
Documentation: of: Document the bindings used by Juno R1 PCIe host bridge
arm64: dts: mt8173: Add clocks for SCPSYS unit
arm64: dts: mt8173: Add subsystem clock controller device nodes
+ Linux 4.3-rc5
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
| -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 dbfe839c201a..8c69cebb24bb 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -169,6 +169,7 @@ pericom Pericom Technology Inc. phytec PHYTEC Messtechnik GmbH picochip Picochip Ltd plathome Plat'Home Co., Ltd. +plda PLDA pixcir PIXCIR MICROELECTRONICS Co., Ltd powervr PowerVR (deprecated, use img) qca Qualcomm Atheros, Inc. |