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: 4095491 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 96896BFF02 for ; Wed, 30 Apr 2014 18:15:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A65B420320 for ; Wed, 30 Apr 2014 18:15:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC30920303 for ; Wed, 30 Apr 2014 18:15:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759356AbaD3SPQ (ORCPT ); Wed, 30 Apr 2014 14:15:16 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:50043 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752186AbaD3SPP (ORCPT ); Wed, 30 Apr 2014 14:15:15 -0400 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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Cc: Kumar Gala , sboyd@codeaurora.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org 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 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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"