Merge "sched/debug: Make the "Preemption disabled at ..." message more useful"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 6 Apr 2017 12:39:40 +0000 (05:39 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Thu, 6 Apr 2017 12:39:40 +0000 (05:39 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 6 Apr 2017 12:39:40 +0000 (05:39 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 6 Apr 2017 12:39:40 +0000 (05:39 -0700)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched/core.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 6 Apr 2017 12:39:40 +0000 (05:39 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 6 Apr 2017 12:39:40 +0000 (05:39 -0700)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history