From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753137AbaIXOtZ (ORCPT ); Wed, 24 Sep 2014 10:49:25 -0400 Received: from smtp.csie.ntu.edu.tw ([140.112.30.61]:41471 "EHLO smtp.csie.ntu.edu.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751620AbaIXOtW (ORCPT ); Wed, 24 Sep 2014 10:49:22 -0400 From: Chen-Yu Tsai To: Maxime Ripard , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala Cc: Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Shuge , Meng Zhang , ctl@merrii.com, Gregory CLEMENT Subject: [PATCH v2 5/7] devicetree: bindings: Add vendor prefix for Merrii Technology Co., Ltd. Date: Wed, 24 Sep 2014 22:48:59 +0800 Message-Id: <1411570141-29960-6-git-send-email-wens@csie.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411570141-29960-1-git-send-email-wens@csie.org> References: <1411570141-29960-1-git-send-email-wens@csie.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Merrii Technology Co., Ltd. is a Chinese ARM integration developer that specializes in Allwinner SoC based designs. Signed-off-by: Chen-Yu Tsai --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) 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. -- 2.1.0