Merge back earlier cpuidle material for v4.10.

author Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Thu, 1 Dec 2016 13:39:51 +0000 (14:39 +0100)

committer Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Thu, 1 Dec 2016 13:39:51 +0000 (14:39 +0100)
author Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 1 Dec 2016 13:39:51 +0000 (14:39 +0100)
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 1 Dec 2016 13:39:51 +0000 (14:39 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sched/core.c
Simple merge
author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 1 Dec 2016 13:39:51 +0000 (14:39 +0100)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 1 Dec 2016 13:39:51 +0000 (14:39 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history