diff options
| author | Ingo Molnar | 2008-10-10 19:50:00 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-10-11 20:17:36 +0200 |
| commit | d84705969f898f294bc3fc32eca33580f14105bd (patch) | |
| tree | c59c7e835820c6bfb5a957f70e58fee1699a6b38 /arch/x86/kernel/xsave.c | |
| parent | Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for... (diff) | |
| parent | x86: fix apic version warning (diff) | |
| download | kernel-qcow2-linux-d84705969f898f294bc3fc32eca33580f14105bd.tar.gz kernel-qcow2-linux-d84705969f898f294bc3fc32eca33580f14105bd.tar.xz kernel-qcow2-linux-d84705969f898f294bc3fc32eca33580f14105bd.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
Diffstat (limited to 'arch/x86/kernel/xsave.c')
0 files changed, 0 insertions, 0 deletions