Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 May 2012 17:53:37 +0000 (10:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 May 2012 17:53:37 +0000 (10:53 -0700)
commit2d117403b30cd7301af60d7d54b279a9f566d10d
tree7c251e86e1a0101fdf11a15aa0e407360d16f71c
parent8ee78c6fb982b3a7343faf561e7937d4cfa955ff
parent82f7af09e6fb58fb725c850d725d5e8780a9bec2
Merge tag 'please-pull-mce' of git://git./linux/kernel/git/ras/ras

Pull mce cleanup from Tony Luck:
 "One more mce cleanup before the 3.5 merge window closes"

* tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  x86/mce: Cleanup timer mess
arch/x86/kernel/cpu/mcheck/mce.c