diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 14:18:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 14:18:42 +0200 |
commit | c00193f9f09f9b852249a66391985f585d066084 (patch) | |
tree | 7ec2e0584fdddd89222a26f666903680b9b73892 /drivers/char/epca.h | |
parent | x86: change early_ioremap to use slots instead of nesting (diff) | |
parent | Merge branch 'linus' into oprofile-v2 (diff) | |
parent | HPET: Remove spurious HPET busy warning message. (diff) | |
download | linux-c00193f9f09f9b852249a66391985f585d066084.tar.xz linux-c00193f9f09f9b852249a66391985f585d066084.zip |
Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4