Ingo Molnar c90423d1de Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move ... Conflicts: kernel/Makefile There are conflicts in kernel/Makefile due to file moving in the scheduler tree - resolve them. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2013-11-06 07:50:37 +01:00
..
rt.h	sched: move RR_TIMESLICE from sysctl.h to rt.h	2013-02-22 09:20:11 -08:00
sysctl.h	Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move	2013-11-06 07:50:37 +01:00