]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clk/clk-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:41:04 +0000 (16:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:41:04 +0000 (16:41 +1100)
commit80396fad37fe3fcc657b44e88461b548f42b71dd
treeffbeb1b3930c920b8d4591dab0f8aa785d4a24c2
parentdab25023bebfb5a3f24d23301eb398884c17bd3e
parent05e3659135a48253b6d4fec489a68a1e00c9f5f6
Merge remote-tracking branch 'clk/clk-next'

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