lkml.org 
[lkml]   [2014]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] clk: qcom: Remove accidental merged reject file
Date
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


\
 
 \ /
  Last update: 2014-04-30 21:01    [W:0.126 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site