| commit | 849e8dea099aafa56db9e74b580b0d858b956533 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 08 19:26:55 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 08 19:26:55 2009 -0800 |
| tree | f97331389507608561e96e96a04546b84a8860fc | |
| parent | e069efb6bbf8f739a2e084183709b5eb76abf90d [diff] | |
| parent | 18ed61da985c57eea3fe8038b13fa2837c9b3c3f [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: 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