git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ac9c6d3 4501c8b)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 8 Jul 2008 10:17:08 +0000 (12:17 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 8 Jul 2008 10:17:08 +0000 (12:17 +0200)
commit	29f33cedbdcdb6691153fc4ba9ca6e078179d2d7
tree	30b159e2a0ffa635488feae5587640a7c21372f3	tree \| snapshot
parent	ac9c6d3c49ef3edf3e02a312a6af85f019aeab56	commit \| diff
parent	4501c8b08a9128c2996fd7332e527e206a81858d	commit \| diff

Merge branch 'x86/nmi' into x86/devel

Conflicts:

arch/x86/kernel/nmi.c
arch/x86/kernel/nmi_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/nmi.c	\|	diff2 \|	blob \| history
arch/x86/kernel/traps_64.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/nmi.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.