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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cbf8b5a d89abe2)

author	Ingo Molnar <mingo@kernel.org>
	Thu, 17 Mar 2016 08:44:57 +0000 (09:44 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Thu, 17 Mar 2016 08:44:57 +0000 (09:44 +0100)
commit	00f526850151e91fdad0896a1436341687ad2582
tree	67c28260020440ade83d6f4aa003ae4f0c683e67	tree \| snapshot
parent	cbf8b5a2b649a501758291cb4d4ba1e5711771ba	commit \| diff
parent	d89abe2a1f0c92499eedc815e4a9b2881f4959a5	commit \| diff

Merge branch 'x86/cleanups' into x86/urgent

Pull in some merge window leftovers.

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

12 files changed:

arch/x86/events/intel/lbr.c	diff1 \|	\|	blob \| history
arch/x86/events/perf_event.h	diff1 \|	\|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kgdb.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/mmu.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/lib/memset_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/mpx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree