Merge "sched: Fix a division by zero bug in scale_exec_time()"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 6 Oct 2016 08:07:17 +0000 (01:07 -0700)

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

Thu, 6 Oct 2016 08:07:16 +0000 (01:07 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 6 Oct 2016 08:07:17 +0000 (01:07 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 6 Oct 2016 08:07:16 +0000 (01:07 -0700)
diff --cc kernel/sched/core.c
Simple merge
diff --cc kernel/sched/hmp.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 6 Oct 2016 08:07:17 +0000 (01:07 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 6 Oct 2016 08:07:16 +0000 (01:07 -0700)
		1	2
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/hmp.c	patch \|	diff1 \|	diff2 \|	blob \| history