tree e0c1d672a1156d7840d3ef650ba1aa963c68e13a
parent f14aa871c7e1e58a01bf33a562ac314fae64517c
parent de28f25e8244c7353abed8de0c7792f5f883588c
author Linus Torvalds <torvalds@linux-foundation.org> 1323132823 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323132823 -0800

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