]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e11db13 24eb238)
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file...
authorIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 06:50:37 +0000 (07:50 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 06:50:37 +0000 (07:50 +0100)
commit6d4c8bfd822569f4fc2a086f6b47fac554c47904
tree8c7a32b37e74155324ae2b556fcc42718ccf29a3tree | snapshot
parente11db134a08a003803912833979fbf47c3d91794commit | diff
parent24eb238cbf4535f12b6dd47ada3a173b70a53f17commit | diff
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>
MAINTAINERS diff1 | diff2 | blob | history
include/linux/sched/sysctl.h diff1 | diff2 | blob | history
include/trace/events/sched.h diff1 | diff2 | blob | history
kernel/Makefile diff1 | diff2 | blob | history
kernel/rcu/tree.c diff1 | | blob | history
kernel/sysctl.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.