From patchwork Wed Apr 30 18:15:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Gala X-Patchwork-Id: 4095501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BB9939F271 for ; Wed, 30 Apr 2014 18:18:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1EFC202FF for ; Wed, 30 Apr 2014 18:18:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2DC84202EA for ; Wed, 30 Apr 2014 18:18:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WfZ2g-0004Ok-Ge; Wed, 30 Apr 2014 18:15:38 +0000 Received: from smtp.codeaurora.org ([198.145.11.231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WfZ2d-0004B6-ER for linux-arm-kernel@lists.infradead.org; Wed, 30 Apr 2014 18:15:35 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id A145113EE00; Wed, 30 Apr 2014 18:15:14 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 940D013F117; Wed, 30 Apr 2014 18:15:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from galak-ubuntu.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com [67.52.129.61]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: galak@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id DF5BC13EE00; Wed, 30 Apr 2014 18:15:13 +0000 (UTC) From: Kumar Gala To: Mike Turquette Subject: [PATCH] clk: qcom: Remove accidental merged reject file Date: Wed, 30 Apr 2014 13:15:11 -0500 Message-Id: <1398881711-5566-1-git-send-email-galak@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140430_111535_506483_DC961D04 X-CRM114-Status: GOOD ( 11.03 ) X-Spam-Score: -0.7 (/) Cc: linux-arm-msm@vger.kernel.org, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kumar Gala X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally added in a merge reject file, so remove it. Signed-off-by: Kumar Gala --- Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej b/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej deleted file mode 100644 index 2e84dbe..0000000 --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- Documentation/devicetree/bindings/clock/qcom,gcc.txt -+++ Documentation/devicetree/bindings/clock/qcom,gcc.txt -@@ -4,6 +4,7 @@ - Required properties : - - compatible : shall contain only one of the following: - -+ "qcom,gcc-apq8064" - "qcom,gcc-ipq8064" - "qcom,gcc-msm8660" - "qcom,gcc-msm8960"