Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151008.0ll_20151008.0

Conflicting files:
arch/arm64/configs/defconfig

1 files changed, 15 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
new file mode 100644
index 000000000000..ceef5e66fa24
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.txt
@@ -0,0 +1,15 @@
+Qualcomm RPM Clock Controller Binding
+------------------------------------------------
+
+Required properties :
+- compatible : shall contain only one of the following:
+
+			"qcom,rpmcc-msm8916"
+
+- #clock-cells : shall contain 1
+
+Example:
+	rpmcc: rpmcc {
+		compatible = "qcom,rpmcc-msm8916";
+		#clock-cells = <1>;
+	};