git.oblomov.eu Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 62fdac5 512626a)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 11 Jun 2009 21:31:52 +0000 (23:31 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 11 Jun 2009 21:31:52 +0000 (23:31 +0200)
commit	0d5959723e1db3fd7323c198a50c16cecf96c7a9
tree	802b623fff261ebcbbddadf84af5524398364a18	tree \| snapshot
parent	62fdac5913f71f8f200bd2c9bd59a02e9a1498e9	commit \| diff
parent	512626a04e72aca60effe111fa0333ed0b195d21	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/entry_arch.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hardirq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/nmi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_intel_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history

Making Linux better for my computers