tree 9197a23f5a94ed7e0987e40e8191a3652df10263
parent 06d4a22be3af824cfcbf53ac84d95bd700a949c2
parent 2344abbcbdb82140050e8be29d3d55e4f6fe860b
author Linus Torvalds <torvalds@linux-foundation.org> 1221866210 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221866210 -0700

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clockevents: make device shutdown robust
  clocksource, acpi_pm.c: fix check for monotonicity
  clockevents: remove WARN_ON which was used to gather information