]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 04:06:09 +0000 (15:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 04:06:09 +0000 (15:06 +1100)
commitdb2f52670fce68fd25501e7dfe5f1a6e5ff76070
treee50a697f98df452d9ec2d0b95b2b548549263125
parentd72cb24903cbc28fb2a487234c81a22405e8a446
parent05e3659135a48253b6d4fec489a68a1e00c9f5f6
Merge remote-tracking branch 'clk/clk-next'

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