From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 04:01:33 +0000 (-0800)
Subject: Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.8-rc1~161
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf;p=~emulex%2Finfiniband.git

Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 timer update from Ingo Molnar:
 "This tree includes HPET fixes and also implements a calibration-free,
  TSC match driven APIC timer interrupt mode: 'TSC deadline mode'
  supported in SandyBridge and later CPUs."

* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: hpet: Fix inverted return value check in arch_setup_hpet_msi()
  x86: hpet: Fix masking of MSI interrupts
  x86: apic: Use tsc deadline for oneshot when available
---

1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf