| commit | 54b56170e4517e9606b245c3f805fc96baa059f0 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Mon Feb 22 16:25:18 2010 -0800 |
| committer | H. Peter Anvin <hpa@zytor.com> | Mon Feb 22 16:25:18 2010 -0800 |
| tree | 9f8750ef972b4a7fdce530889dcbaf2a8b5b0d05 | |
| parent | 1f91233c26fd5f7d6525fd29b95e4b50ca7a3e88 [diff] | |
| parent | d02e30c31c57683a66ed68a1bcff900ca78f6d56 [diff] |
Merge remote branch 'origin/x86/apic' into x86/mrst Conflicts: arch/x86/kernel/apic/io_apic.c