]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 06:54:53 +0000 (16:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 06:54:53 +0000 (16:54 +1000)
commitadbb71e75e4c3d799b0625c0a0044948a1b5684f
tree34bcf8c202dc2970117159d36afbd258028f93ea
parent62c2ce32a4ea16d84c9bba06bd03062025f1cfb2
parent6ed8eb59e53b3f411bce36b9fa6bd491863888ef
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
drivers/clk/Makefile