Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Sep 2008 23:39:50 +0000 (16:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Sep 2008 23:39:50 +0000 (16:39 -0700)
commitc0f4d6d4b14a75a341d972ff73fb9740e1ceb634
tree99addc159172d29417d697e8f832721e2d4355e2
parent1126388609dee3f2aca2a64de7b0709d0fede785
parent1eda81495a49a4ee91d8863b0a441a624375efea
Merge branch 'timers-fixes-for-linus' of git://git./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:
  x86: prevent stale state of c1e_mask across CPU offline/online, fix