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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d847059 43603c8)

author	Ingo Molnar <mingo@elte.hu>
	Sat, 11 Oct 2008 18:23:20 +0000 (20:23 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 11 Oct 2008 18:23:20 +0000 (20:23 +0200)
commit	0afe2db21394820d32646a695eccf3fbfe6ab5c7
tree	6d925383f444a242ebc77d167420efb7e6ad8d99	tree \| snapshot
parent	d84705969f898f294bc3fc32eca33580f14105bd	commit \| diff
parent	43603c8df97f246e8be7b9cc92a8f968a85108bd	commit \| diff

Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D

Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h

12 files changed:

arch/x86/ia32/ia32_signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/sigframe.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.h	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/thread_info.h	diff1 \|	diff2 \|	blob \| history
include/linux/ioport.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree