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)
* '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


Trivial merge