diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:02:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:02:23 +0100 |
| commit | 8e818179eb9e8f9e44d8410dd2a25077d026a08e (patch) | |
| tree | 7d08afd30c95c04129c20693d974a18799caeb5a /drivers/tc | |
| parent | perfcounters/powerpc: Add support for POWER5 processors (diff) | |
| parent | Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linu... (diff) | |
| download | linux-8e818179eb9e8f9e44d8410dd2a25077d026a08e.tar.xz linux-8e818179eb9e8f9e44d8410dd2a25077d026a08e.zip | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/tc')
0 files changed, 0 insertions, 0 deletions