git.kernel.dk Git - linux-2.6-block.git/commit - arch/arm/mach-realview/realview_pb11mp.c

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c474e50 1001354)

author	Ingo Molnar <mingo@kernel.org>
	Sun, 16 Oct 2016 11:04:34 +0000 (13:04 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Sun, 16 Oct 2016 11:04:34 +0000 (13:04 +0200)
commit	4d69f155d58d0f75c5404ea502178b1943a04755
tree	fe5b7608f05f6951fce748ea1e93d942b52902bd	tree \| snapshot
parent	c474e50711aa79b7bd0ea30b44744baca5650375	commit \| diff
parent	1001354ca34179f3db924eb66672442a173147dc	commit \| diff

Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict

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

arch/x86/kernel/fpu/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/xstate.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/cpuid.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
include/linux/kvm_host.h	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)