diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 03:26:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 03:26:55 (GMT) |
| commit | 849e8dea099aafa56db9e74b580b0d858b956533 (patch) | |
| tree | f97331389507608561e96e96a04546b84a8860fc /arch/m68k/sun3 | |
| parent | e069efb6bbf8f739a2e084183709b5eb76abf90d (diff) | |
| parent | 18ed61da985c57eea3fe8038b13fa2837c9b3c3f (diff) | |
| download | linux-fsl-qoriq-849e8dea099aafa56db9e74b580b0d858b956533.tar.xz | |
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
Diffstat (limited to 'arch/m68k/sun3')
0 files changed, 0 insertions, 0 deletions