diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-05 16:53:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-05 16:53:43 -0800 |
| commit | 40c043b077c6e377c8440d71563c055d0c4f0f0a (patch) | |
| tree | e0c1d672a1156d7840d3ef650ba1aa963c68e13a /arch/arm/kernel/perf_event.c | |
| parent | f14aa871c7e1e58a01bf33a562ac314fae64517c (diff) | |
| parent | de28f25e8244c7353abed8de0c7792f5f883588c (diff) | |
| download | linux-40c043b077c6e377c8440d71563c055d0c4f0f0a.tar.bz2 | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clockevents: Set noop handler in clockevents_exchange_device()
tick-broadcast: Stop active broadcast device when replacing it
clocksource: Fix bug with max_deferment margin calculation
rtc: Fix some bugs that allowed accumulating time drift in suspend/resume
rtc: Disable the alarm in the hardware
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions