diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2014-09-24 10:48:59 -0400 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-10-20 08:51:27 -0400 |
| commit | bb647665bae4dfdf7e1d07540325eab81f9800a8 (patch) | |
| tree | 31bec9347a726401a18214015c10b37a9d613aba | |
| parent | d4da889a53d9dabe1c75384f3175dab7ff06c4ee (diff) | |
devicetree: bindings: Add vendor prefix for Merrii Technology Co., Ltd.
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>
| -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 723999d73744..3da78a14e6c7 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
| @@ -90,6 +90,7 @@ lltc Linear Technology Corporation | |||
| 90 | marvell Marvell Technology Group Ltd. | 90 | marvell Marvell Technology Group Ltd. |
| 91 | maxim Maxim Integrated Products | 91 | maxim Maxim Integrated Products |
| 92 | mediatek MediaTek Inc. | 92 | mediatek MediaTek Inc. |
| 93 | merrii Merrii Technology Co., Ltd. | ||
| 93 | micrel Micrel Inc. | 94 | micrel Micrel Inc. |
| 94 | microchip Microchip Technology Inc. | 95 | microchip Microchip Technology Inc. |
| 95 | mitsubishi Mitsubishi Electric Corporation | 96 | mitsubishi Mitsubishi Electric Corporation |