]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clockevents/clockevents/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:26:15 +0000 (15:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 05:26:15 +0000 (15:26 +1000)
commit7921e9ca2006777ec0fe739da76418fec0f87384
treeb2626a7b7a85116b838ba1aee7514768c08a23fa
parent5cd181c125b603fdca603e00d9a859abc50dc40a
parent4c8305221193e14752e0fa833a38f856bbe1d22b
Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
arch/arm/mach-rockchip/Kconfig
drivers/clocksource/Kconfig
drivers/clocksource/rockchip_timer.c