diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 12:59:23 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 12:59:23 (GMT) |
| commit | cfb6d656d569510ac9239583ce09e4c92ad54719 (patch) | |
| tree | f80d4526a5a293d69a0262b04890ba296c8874ab /arch/x86/kernel | |
| parent | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (diff) | |
| parent | 220069945b298d3998c6598b081c466dca259929 (diff) | |
| download | linux-fsl-qoriq-cfb6d656d569510ac9239583ce09e4c92ad54719.tar.xz | |
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>
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions