Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Tue, 30 Sep 2008 15:39:18 +0000 (08:39 -0700)
committerLinus Torvalds <[email protected]>
Tue, 30 Sep 2008 15:39:28 +0000 (08:39 -0700)
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimer: prevent migration of per CPU hrtimers
  hrtimer: mark migration state
  hrtimer: fix migration of CB_IRQSAFE_NO_SOFTIRQ hrtimers
  hrtimer: migrate pending list on cpu offline

Acked-by: Paul E. McKenney <[email protected]>
Acked-by: Benjamin Herrenschmidt <[email protected]>
Tested-by: Paul E. McKenney <[email protected]>

Trivial merge