From: Kumar Gala <galak@codeaurora.org>
To: Mike Turquette <mturquette@linaro.org>
Cc: Kumar Gala <galak@codeaurora.org>,
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 [thread overview]
Message-ID: <1398881711-5566-1-git-send-email-galak@codeaurora.org> (raw)
Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally
added in a merge reject file, so remove it.
Signed-off-by: Kumar Gala <galak@codeaurora.org>
---
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"
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next reply other threads:[~2014-04-30 18:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-30 18:15 Kumar Gala [this message]
2014-04-30 18:41 ` [PATCH] clk: qcom: Remove accidental merged reject file Sergei Shtylyov
2014-04-30 18:57 ` Mike Turquette
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398881711-5566-1-git-send-email-galak@codeaurora.org \
--to=galak@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).