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 <[email protected]>

2013-11-06 07:50:37 +01:00

..

rt.h

…

sysctl.h

Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move

2013-11-06 07:50:37 +01:00