| Message ID | 1411570141-29960-6-git-send-email-wens@csie.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wed, Sep 24, 2014 at 10:48:59PM +0800, Chen-Yu Tsai wrote: > 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> Queued, thanks! Maxime
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index ac7269f..d3a96ac 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -81,6 +81,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. mosaixtech Mosaix Technologies, Inc.
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> --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+)