| commit | fc6fc7f1b1095b92d4834e69b385b91e412a7ce5 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Feb 22 20:05:19 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Feb 22 20:05:19 2009 +0100 |
| tree | 2ad451d5dac4d460830536944cef1de93be36b2a | |
| parent | ef1f87aa7ba6224bef1b750b3272ba281d8f43ed [diff] | |
| parent | 770824bdc421ff58a64db608294323571c949f4c [diff] |
Merge branch 'linus' into x86/apic Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu>