diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 04:26:55 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 04:26:55 +0100 |
| commit | 849e8dea099aafa56db9e74b580b0d858b956533 (patch) | |
| tree | f97331389507608561e96e96a04546b84a8860fc /init | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | x86: hpet: Make WARN_ON understandable (diff) | |
| download | linux-849e8dea099aafa56db9e74b580b0d858b956533.tar.xz linux-849e8dea099aafa56db9e74b580b0d858b956533.zip | |
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 'init')
0 files changed, 0 insertions, 0 deletions