linux - linux

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'sched/core' of ↵	Martin Schwidefsky	2011-12-19	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|	git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip 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/	Peter Zijlstra	2011-11-17	1	-0/+233
	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>