From: Linus Torvalds 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: firefly_0821_release~9833^2~2108 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1;p=firefly-linux-kernel-4.4.55.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: Add reference to chipset erratum documentation for disable-hpet-msi-quirk x86, hpet: Restrict read back to affected ATI chipsets --- 6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1