commit | 6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 19 17:10:24 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 19 17:10:24 2010 -0700 |
tree | bf3cd405213c37f1ed363c3b2f542088e05ea571 | |
parent | 7d02093e29de9efc4a72d5e93baae9506969b789 [diff] | |
parent | fec84e330719c20d2146c8dbdc9ff50b3a1d7039 [diff] |
Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/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