From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 May 2010 00:10:24 +0000 (-0700)
Subject: Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.35-rc1~494
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1;hp=6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1

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: Add reference to chipset erratum documentation for disable-hpet-msi-quirk
  x86, hpet: Restrict read back to affected ATI chipsets
---