git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eb60b3e e5ef27d)

author	Ingo Molnar <mingo@kernel.org>
	Thu, 12 May 2016 07:51:36 +0000 (09:51 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Thu, 12 May 2016 07:51:36 +0000 (09:51 +0200)
commit	4eb867651721228ee2eeae142c53378375303e8b
tree	43ebd9894ff53a7b2d0244293f226cbbfc80d882	tree \| snapshot
parent	eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6	commit \| diff
parent	e5ef27d0f5acf9f1db2882d7546a41c021f66820	commit \| diff

Merge branch 'smp/hotplug' into sched/core, to resolve conflicts

Conflicts:
kernel/sched/core.c

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

include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.