diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:46:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:46:47 +0100 |
| commit | f76d02e2d164bdcb939a0261c5f453c63a3da86c (patch) | |
| tree | 1edf3dd6f4a75dc63eaf9d41e264e0208eda3ddb /Documentation/devicetree | |
| parent | 54137bf6112db699329cbe915ea7332c8cbbeace (diff) | |
| parent | 26ca8b52d6e18c10109cabda0f775dd9345bbfdf (diff) | |
| download | talos-op-linux-f76d02e2d164bdcb939a0261c5f453c63a3da86c.tar.gz talos-op-linux-f76d02e2d164bdcb939a0261c5f453c63a3da86c.zip | |
Merge tag 'mvebu-dt-4.10-2' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.10 (part 1)" from Gregory CLEMENT:
Add Turris Omnia support, an open hardware router Armada 385 based
* tag 'mvebu-dt-4.10-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: add support for Turris Omnia
devicetree: Add vendor prefix for CZ.NIC
Diffstat (limited to 'Documentation/devicetree')
| -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 17194f30d65e..b9ec0396775c 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -67,6 +67,7 @@ creative Creative Technology Ltd crystalfontz Crystalfontz America, Inc. cubietech Cubietech, Ltd. cypress Cypress Semiconductor Corporation +cznic CZ.NIC, z.s.p.o. dallas Maxim Integrated Products (formerly Dallas Semiconductor) davicom DAVICOM Semiconductor, Inc. delta Delta Electronics, Inc. |
