| commit | aef55d4922e62a0d887e60d87319f3718aec6ced | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Sat Feb 20 21:51:42 2010 -0800 |
| committer | H. Peter Anvin <hpa@zytor.com> | Sat Feb 20 22:54:05 2010 -0800 |
| tree | e81bdf46d49fa3421747b2b2074aaeae3aee890b | |
| parent | ca4dbc668412d5fe039be3e26e8e717a616d1ca5 [diff] | |
| parent | eb5b3794062824ba12d883901eea49ea89d0a678 [diff] |
Merge branch 'x86/urgent' into x86/irq Merge reason: conflict 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>