diff options
author | Olof Johansson | 2015-01-23 23:17:15 +0100 |
---|---|---|
committer | Olof Johansson | 2015-01-23 23:17:15 +0100 |
commit | fd10a2e4113971f42c05796b8a487fdf10d32c48 (patch) | |
tree | d76a77815f585ee7ad106e4a3dfe83825160cd52 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
parent | Merge tag 'v3.20-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | ARM: mvebu: make DTS comments reflect DEBUG_LL changes (diff) | |
download | kernel-qcow2-linux-fd10a2e4113971f42c05796b8a487fdf10d32c48.tar.gz kernel-qcow2-linux-fd10a2e4113971f42c05796b8a487fdf10d32c48.tar.xz kernel-qcow2-linux-fd10a2e4113971f42c05796b8a487fdf10d32c48.zip |
Merge tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu/dt #2" from Andrew Lunn:
Second set of dt patches for mvebu for v3.20.
* tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: make DTS comments reflect DEBUG_LL changes
ARM: mvebu: Armada 385 GP: Add regulators to the SATA port
ARM: Kirkwood: Added support for pogoplug e02 (pink/gray)
ARM: mvebu: fix compatible strings of MBus on Armada 375 and Armada 38x
dt: bindings: update mvebu-mbus DT binding with new compatible properties
Signed-off-by: Olof Johansson <olof@lixom.net>
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 76a4b3b43e59..74187660619b 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -35,6 +35,7 @@ chipidea Chipidea, Inc chrp Common Hardware Reference Platform chunghwa Chunghwa Picture Tubes Ltd. cirrus Cirrus Logic, Inc. +cloudengines Cloud Engines, Inc. cnm Chips&Media, Inc. cortina Cortina Systems, Inc. crystalfontz Crystalfontz America, Inc. |