Merge "sched: Track average sleep time"

author Linux Build Service Account <lnxbuild@localhost>

Tue, 20 Dec 2016 01:04:55 +0000 (17:04 -0800)

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

Tue, 20 Dec 2016 01:04:55 +0000 (17:04 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Tue, 20 Dec 2016 01:04:55 +0000 (17:04 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Tue, 20 Dec 2016 01:04:55 +0000 (17:04 -0800)
diff --cc include/linux/sched.h
Simple merge
diff --cc include/trace/events/sched.h
Simple merge
diff --cc kernel/sched/core.c
Simple merge
diff --cc kernel/sched/sched.h
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Tue, 20 Dec 2016 01:04:55 +0000 (17:04 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Tue, 20 Dec 2016 01:04:55 +0000 (17:04 -0800)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/trace/events/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history