| commit | bc030d6cb9532877c1c5a3f5e7123344fa24a285 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Jan 04 09:43:42 2011 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Jan 04 09:43:42 2011 +0100 |
| tree | d223d410b868b80d4c0deec192d354a5d06b201a | |
| parent | d3bd058826aa8b79590cca6c8e6d1557bf576ada [diff] | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 [diff] |
Merge commit 'v2.6.37-rc8' into x86/apic Conflicts: arch/x86/include/asm/io_apic.h Merge reason: move to a fresh -rc, resolve the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>