| commit | b1864e9a1afef41709886072c6e6248def0386f4 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 09:49:38 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 13 09:49:38 2009 +0100 |
| tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e | |
| parent | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 [diff] | |
| parent | 7032e8696726354d6180d8a2d17191f958cd93ae [diff] |
Merge branch 'x86/core' into perfcounters/core Conflicts: arch/x86/Kconfig arch/x86/kernel/apic.c arch/x86/kernel/setup_percpu.c