git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Wed, 6 Nov 2013 06:50:37 +0000 (07:50 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 6 Nov 2013 06:50:37 +0000 (07:50 +0100)
commit	c90423d1de12fbeaf0c898e1db0e962de347302b
tree	8c7a32b37e74155324ae2b556fcc42718ccf29a3	tree \| snapshot
parent	ecf1f014325ba60f4df35edae1a357c67c5d4eb1	commit \| diff
parent	b8a216269ec0ce2e961d32e6d640d7010b8a818e	commit \| 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

John Crispins staging tree

RSS Atom

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