]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 05:30:37 +0000 (16:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Mar 2014 05:30:37 +0000 (16:30 +1100)
1  2 
arch/arm/boot/dts/socfpga.dtsi

Simple merge