diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:59:23 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:59:23 +0200 |
| commit | cfb6d656d569510ac9239583ce09e4c92ad54719 (patch) | |
| tree | f80d4526a5a293d69a0262b04890ba296c8874ab /security | |
| parent | Merge branch 'linus' into timers/core (diff) | |
| parent | clocksource: arch_timer: Add support for memory mapped timers (diff) | |
| download | linux-cfb6d656d569510ac9239583ce09e4c92ad54719.tar.xz linux-cfb6d656d569510ac9239583ce09e4c92ad54719.zip | |
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 'security')
0 files changed, 0 insertions, 0 deletions