Merge remote-tracking branch 'clk/clk-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Sep 2016 03:17:55 +0000 (13:17 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Sep 2016 03:17:55 +0000 (13:17 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 03:17:55 +0000 (13:17 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 03:17:55 +0000 (13:17 +1000)
diff --cc Documentation/devicetree/bindings/clock/qcom,gcc.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 03:17:55 +0000 (13:17 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 03:17:55 +0000 (13:17 +1000)
		1	2
Documentation/devicetree/bindings/clock/qcom,gcc.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history