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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b2c5110 37868fe)

author	Ingo Molnar <mingo@kernel.org>
	Fri, 31 Jul 2015 08:23:35 +0000 (10:23 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 31 Jul 2015 08:23:35 +0000 (10:23 +0200)
commit	5b929bd11df23922daf1be5d52731cc3900c1d79
tree	105fa5987b03c9f4e0260a9eb04dff7bb3d16839	tree \| snapshot
parent	b2c51106c7581866c37ffc77c5d739f3d4b7cbc9	commit \| diff
parent	37868fe113ff2ba814b3b4eb12df214df555f8dc	commit \| diff

Merge branch 'x86/urgent' into x86/asm, before applying dependent patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>

15 files changed:

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64_compat.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/espfix_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/nmi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/lapic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree