| commit | d02e30c31c57683a66ed68a1bcff900ca78f6d56 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Mon Feb 22 16:20:34 2010 -0800 |
| committer | H. Peter Anvin <hpa@zytor.com> | Mon Feb 22 16:20:34 2010 -0800 |
| tree | c3ce99a00061bcc1199b50fa838147d876c56717 | |
| parent | 0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9 [diff] | |
| parent | aef55d4922e62a0d887e60d87319f3718aec6ced [diff] |
Merge branch 'x86/irq' into x86/apic Merge reason: Conflicts in arch/x86/kernel/apic/io_apic.c Resolved Conflicts: arch/x86/kernel/apic/io_apic.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>