From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Dec 2009 03:26:55 +0000 (-0800)
Subject: Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~25730
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=849e8dea099aafa56db9e74b580b0d858b956533;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'timers-for-linus-hpet' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: hpet: Make WARN_ON understandable
  x86: arch specific support for remapping HPET MSIs
  intr-remap: generic support for remapping HPET MSIs
  x86, hpet: Simplify the HPET code
  x86, hpet: Disable per-cpu hpet timer if ARAT is supported
---

849e8dea099aafa56db9e74b580b0d858b956533