]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
projects / mirror_ubuntu-eoan-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 725c258 1149454)
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:50:00 +0000 (19:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 11 Oct 2008 18:17:36 +0000 (20:17 +0200)
commitd84705969f898f294bc3fc32eca33580f14105bd
treec59c7e835820c6bfb5a957f70e58fee1699a6b38tree
parent725c25819e4a0dafdcf42a5f31bc569341919c7ccommit | diff
parent11494547b1754c4f3bd7f707ab869e2adf54d52fcommit | diff
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
19 files changed:
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/acpi/boot.c diff1 | diff2 | blob | history
arch/x86/kernel/apic_32.c diff1 | diff2 | blob | history
arch/x86/kernel/apic_64.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/common_64.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/feature_names.c diff1 | diff2 | blob | history
arch/x86/kernel/genx2apic_uv_x.c diff1 | diff2 | blob | history
arch/x86/kernel/mpparse.c diff1 | diff2 | blob | history
arch/x86/kernel/numaq_32.c diff1 | diff2 | blob | history
arch/x86/kernel/paravirt.c diff1 | diff2 | blob | history
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
arch/x86/kernel/vmi_32.c diff1 | diff2 | blob | history
arch/x86/xen/enlighten.c diff1 | diff2 | blob | history
include/asm-x86/apic.h diff1 | diff2 | blob | history
include/asm-x86/cpufeature.h diff1 | diff2 | blob | history
include/asm-x86/genapic_64.h diff1 | diff2 | blob | history
include/asm-x86/paravirt.h diff1 | diff2 | blob | history
Ubuntu Eoan Linux kernel mirror