| commit | 8067794bec1cc5de1431102cf0a6a1c7ce75cd85 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Aug 11 11:19:20 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Aug 11 11:19:20 2008 +0200 |
| tree | 2bfa0fba060d253bbd972282b29a3d60c3e7cb7f | |
| parent | 7ab6af7ab69df8c9c5fbc380004fb81187742096 [diff] | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c [diff] |
Merge branch 'linus' into x86/x2apic Conflicts: arch/x86/kernel/genapic_64.c Manual merge: arch/x86/kernel/genx2apic_uv_x.c Signed-off-by: Ingo Molnar <mingo@elte.hu>