]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2930833 10a010f)
Merge branch 'x86/x2apic' into x86/core
authorIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:29:23 +0000 (16:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:29:23 +0000 (16:29 +0200)
commit6dec3a10a7a6093af10cef7ac56021150afd6451
treef4d8511f023e3e0c203baf889d4a0f3925882381tree | snapshot
parent29308333fbe2cc61258c1c470f9403960428beb2commit | diff
parent10a010f6953b5a14ba2f0be40a4fce1bea220875commit | diff
Merge branch 'x86/x2apic' into x86/core

Conflicts:

include/asm-x86/i8259.h
include/asm-x86/msidef.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 files changed:
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
include/asm-x86/apic.h diff1 | diff2 | blob | history
include/asm-x86/apicdef.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/hw_irq.h diff1 | diff2 | blob | history
include/asm-x86/i8259.h diff1 | diff2 | blob | history
include/asm-x86/io_apic.h diff1 | diff2 | blob | history
include/asm-x86/ipi.h diff1 | diff2 | blob | history
include/asm-x86/mach-default/mach_apic.h diff1 | diff2 | blob | history
include/asm-x86/mach-default/mach_apicdef.h diff1 | diff2 | blob | history
include/asm-x86/mach-es7000/mach_apic.h diff1 | diff2 | blob | history
include/asm-x86/msidef.h diff1 | diff2 | blob | history
include/asm-x86/paravirt.h diff1 | diff2 | blob | history
include/asm-x86/smp.h diff1 | diff2 | blob | history
kernel/irq/manage.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.