linux-toradex.git/kernel/sched/stats.h, branch v3.4.73 Linux kernel for Apalis and Colibri modules Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip 2011-12-19T18:23:15+00:00 Martin Schwidefsky schwidefsky@de.ibm.com 2011-12-19T18:23:15+00:00 612ef28a045efadb3a98d4492ead7806a146485d Conflicts: drivers/cpufreq/cpufreq_conservative.c drivers/cpufreq/cpufreq_ondemand.c drivers/macintosh/rack-meter.c fs/proc/stat.c fs/proc/uptime.c kernel/sched/core.c 
Conflicts:
	drivers/cpufreq/cpufreq_conservative.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/macintosh/rack-meter.c
	fs/proc/stat.c
	fs/proc/uptime.c
	kernel/sched/core.c
sched: Move all scheduler bits into kernel/sched/ 2011-11-17T11:20:22+00:00 Peter Zijlstra a.p.zijlstra@chello.nl 2011-11-15T16:14:39+00:00 391e43da797a96aeb65410281891f6d0b0e9611c There's too many sched*.[ch] files in kernel/, give them their own directory. (No code changed, other than Makefile glue added.) Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu> 
There's too many sched*.[ch] files in kernel/, give them their own
directory.

(No code changed, other than Makefile glue added.)

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>