projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d4da889)
devicetree: bindings: Add vendor prefix for Merrii Technology Co., Ltd.
authorChen-Yu Tsai <wens@csie.org>
Wed, 24 Sep 2014 14:48:59 +0000 (22:48 +0800)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 20 Oct 2014 12:51:27 +0000 (14:51 +0200)
Merrii Technology Co., Ltd. is a Chinese ARM integration developer that
specializes in Allwinner SoC based designs.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Documentation/devicetree/bindings/vendor-prefixes.txt patch | blob | blame | history

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 723999d737445274728bedde163d3534ca62339c..3da78a14e6c764ca5038dbd3b47ed4e9cbaac01b 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -90,6 +90,7 @@ lltc  Linear Technology Corporation
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
 mediatek       MediaTek Inc.
+merrii Merrii Technology Co., Ltd.
 micrel Micrel Inc.
 microchip      Microchip Technology Inc.
 mitsubishi     Mitsubishi Electric Corporation