]> 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 Jan 2014 04:48:31 +0000 (15:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 04:48:31 +0000 (15:48 +1100)
commite69fae4b7ccc2917b11eea59c46c5fd8650dcfdd
treeba5c9fcdb3b2aaf0bbfbe1c7035c214f20a3ba0b
parent43b9a868c7eaa10f7a69a94e6d29fe65f6833bcb
parent98aefbe72ec6015f90fe045ed16c5cf755da283d
Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
drivers/clocksource/clksrc-of.c
arch/arm/boot/dts/sun5i-a10s.dtsi
arch/arm/boot/dts/sun7i-a20.dtsi
arch/arm/mach-sunxi/Kconfig
drivers/clocksource/Kconfig
drivers/clocksource/clksrc-of.c
drivers/clocksource/nomadik-mtu.c
drivers/clocksource/sh_mtu2.c
drivers/clocksource/sh_tmu.c
drivers/clocksource/sun4i_timer.c
drivers/clocksource/time-armada-370-xp.c