| commit | 42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Sep 04 13:02:35 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Sep 04 13:02:35 2008 +0200 |
| tree | e9684c84f53272319a5acd4b9c86503f30274a51 | |
| parent | 11c231a962c740b3216eb6565149ae5a7944cba7 [diff] | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 [diff] |
Merge branch 'linus' into x86/x2apic Conflicts: arch/x86/kernel/cpu/cyrix.c include/asm-x86/cpufeature.h Signed-off-by: Ingo Molnar <mingo@elte.hu>