tree 99addc159172d29417d697e8f832721e2d4355e2
parent 1126388609dee3f2aca2a64de7b0709d0fede785
parent 1eda81495a49a4ee91d8863b0a441a624375efea
author Linus Torvalds <torvalds@linux-foundation.org> 1222299590 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222299590 -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:
  x86: prevent stale state of c1e_mask across CPU offline/online, fix