]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 15:39:18 +0000 (08:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Sep 2008 15:39:28 +0000 (08:39 -0700)
commitcf4b0b2c9520728e170f7a3061e24dbae0b56ed4
tree84b014876a95340c66755bbbf6e943478bc4419a
parent94aca1dac6f6d21f4b07e4864baf7768cabcc6e7
parentccc7dadf736639da86f3e0c86832c11a66fc8221
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:
  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 <paulmck@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>