projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fac778a 2200699)
Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clocke...
authorThomas Gleixner <tglx@linutronix.de>
Wed, 21 Aug 2013 12:59:23 +0000 (14:59 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 21 Aug 2013 12:59:23 +0000 (14:59 +0200)
commitcfb6d656d569510ac9239583ce09e4c92ad54719
treef80d4526a5a293d69a0262b04890ba296c8874abtree
parentfac778a2b8d6ca953d440baeee72901c2dd5aad9commit | diff
parent220069945b298d3998c6598b081c466dca259929commit | diff
Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core

* Support for memory mapped arch_timers
* Trivial fixes to the moxart timer code
* Documentation updates

Trivial conflicts in drivers/clocksource/arm_arch_timer.c. Fixed up
the newly added __cpuinit annotations as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/arm/include/asm/arch_timer.h diff1 | diff2 | blob | history
arch/arm64/include/asm/arch_timer.h diff1 | diff2 | blob | history
drivers/clocksource/arm_arch_timer.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository