diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 19:50:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 20:17:36 +0200 |
| commit | 536663af761631427863c2290e900d08683de75c (patch) | |
| tree | 3dea25b65697061a79562fb9ea8c229a6a475ce5 | |
| parent | 65c3928aab58da8f1b77204a219ffa5aa21842fa (diff) | |
| parent | 83d0376f59533661a9af691e4e9f9d79eb239288 (diff) | |
| download | linux-crypto-536663af761631427863c2290e900d08683de75c.tar.gz linux-crypto-536663af761631427863c2290e900d08683de75c.zip | |
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h
0 files changed, 0 insertions, 0 deletions