git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2b4fa85 8700600)

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	4b62ac9a2b859f932afd5625362c927111b7dd9b
tree	30b159e2a0ffa635488feae5587640a7c21372f3	tree \| snapshot
parent	2b4fa851b2f06fdb04cac808b57324f5e51e1578	commit \| diff
parent	8700600a74852d75eb965b969dcf9f58e2b32546	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

John Crispins staging tree