]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'clockevents/clockevents/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:20:04 +0000 (18:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:20:04 +0000 (18:20 +1100)
commit81f3b18259b5a3a3e0f71cef698a5754262ad185
treeed06e3371c9e70adb1198de41538c3c3841bf59a
parent8e047daf499a2ee81dda1598fc8a1ca5993030a7
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