]> 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, 25 Jul 2012 02:53:33 +0000 (12:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:53:33 +0000 (12:53 +1000)
commit552a45da49c37bacb032ab4b3dc66a855f42c708
treeed16af37eff4e7d0eeb74aaa32b53ed5031549da
parent7e0e09ab6678ceca54bc13baac0683d7ca8ee9cf
parent137f8a7213d80c1388ca48280c1ef0856b6fec30
Merge remote-tracking branch 'clk/clk-next'

Conflicts:
drivers/clk/Makefile
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/dts/highbank.dts
arch/arm/mach-integrator/integrator_ap.c
drivers/clk/Makefile
include/linux/clk.h