]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 04:13:33 +0000 (15:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 04:13:33 +0000 (15:13 +1100)
commit78de1cef8b31e5fd0af77be5ae20cf9ea2e9e1ae
treea39ec1ba46aa5163f2308451d0b9397820bbc0be
parentad033bfd8a569828a9feac9a0b898674127c2b5d
parent9be9d482bcf5a0a3e0ae131a98573b9e2d358915
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
arch/arm/include/asm/hardware/sp810.h
arch/arm/include/asm/hardware/sp810.h