2014-04-30 18:15:18

by Kumar Gala

Subject: [PATCH] clk: qcom: Remove accidental merged reject file

Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally
added in a merge reject file, so remove it.

Signed-off-by: Kumar Gala <[email protected]>
---
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

2014-04-30 18:41:49

by Sergei Shtylyov

Subject: Re: [PATCH] clk: qcom: Remove accidental merged reject file

Hello.

On 04/30/2014 10:15 PM, Kumar Gala wrote:

> Looks like commit cff558c79f572530bdbbb9b847134094008afcef accidentally

Please also specify that commit's summary in parens.

> added in a merge reject file, so remove it.

> Signed-off-by: Kumar Gala <[email protected]>

WBR, Sergei