]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'linus' into x86/mce3
authorIngo Molnar <mingo@elte.hu>
Thu, 11 Jun 2009 21:31:52 +0000 (23:31 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 11 Jun 2009 21:31:52 +0000 (23:31 +0200)
commit0d5959723e1db3fd7323c198a50c16cecf96c7a9
tree802b623fff261ebcbbddadf84af5524398364a18
parent62fdac5913f71f8f200bd2c9bd59a02e9a1498e9
parent512626a04e72aca60effe111fa0333ed0b195d21
Merge branch 'linus' into x86/mce3

Conflicts:
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 files changed:
Documentation/x86/x86_64/boot-options.txt
arch/x86/Kconfig
arch/x86/include/asm/entry_arch.h
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/irq_vectors.h
arch/x86/include/asm/msr-index.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/nmi.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/irq.c
arch/x86/kernel/irqinit.c
arch/x86/kernel/signal.c
arch/x86/kernel/smp.c
arch/x86/kernel/traps.c
kernel/timer.c