]> 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, 20 Feb 2013 05:37:50 +0000 (16:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:37:50 +0000 (16:37 +1100)
commit01ef3d665571254089b4ba8ca7a042bad2c87f09
treeddf8ca53ad62e288e70693c7e98513f74dfc75ef
parenta0b2dea1fdcf896822842a21ef638cc0560f6783
parentfde8bc59c03c0ad1fa4f655e0ed5cc1f76d11e8b
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
include/asm-generic/vmlinux.lds.h
arch/arm/mach-highbank/highbank.c
drivers/clk/Makefile
drivers/clk/clk-highbank.c
drivers/clk/mxs/clk-imx28.c
drivers/clk/versatile/clk-vexpress.c
drivers/clocksource/sunxi_timer.c
include/asm-generic/vmlinux.lds.h