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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d6a65df 1824090)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Sep 2009 10:18:15 +0000 (12:18 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 15 Sep 2009 10:18:15 +0000 (12:18 +0200)
commit	dca2d6ac09d9ef59ff46820d4f0c94b08a671202
tree	fdec753b842dad09e3a4151954fab3eb5c43500d	tree \| snapshot
parent	d6a65dffb30d8636b1e5d4c201564ef401a246cf	commit \| diff
parent	18240904960a39e582ced8ba8ececb10b8c22dd3	commit \| diff

Merge branch 'linus' into tracing/hw-breakpoints

Conflicts:
arch/x86/kernel/process_64.c

Semantic conflict fixed in:
arch/x86/kvm/x86.c

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

arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree