| commit | 0b6de0092244c98b5ba1abda34c92470a20e0d0c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Feb 17 17:20:11 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Feb 17 17:20:11 2009 +0100 |
| tree | 478e4e18c33fd9fa517559e1ce951fe378d5965f | |
| parent | 37a25424252b6cff4dd4b1937ab6a1dbfcadabcc [diff] | |
| parent | f62bae5009c1ba596cd475cafbc83e0570a36e26 [diff] |
Merge branch 'x86/apic' into perfcounters/core Conflicts: arch/x86/kernel/cpu/perfctr-watchdog.c