Merge branch 'core/rcu' into core/locking, to prepare the kernel/locking/ file move
authorIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 06:43:37 +0000 (07:43 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Nov 2013 06:43:37 +0000 (07:43 +0100)
There are conflicts in lockdep.c due to RCU changes, and also the RCU
tree changes kernel/Makefile - so pre-merge it to ease the moving of
locking related .c files to kernel/locking/.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge