| commit | 40c043b077c6e377c8440d71563c055d0c4f0f0a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 05 16:53:43 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 05 16:53:43 2011 -0800 |
| tree | e0c1d672a1156d7840d3ef650ba1aa963c68e13a | |
| parent | f14aa871c7e1e58a01bf33a562ac314fae64517c [diff] | |
| parent | de28f25e8244c7353abed8de0c7792f5f883588c [diff] |
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