From: Ingo Molnar Date: Wed, 6 Nov 2013 06:43:37 +0000 (+0100) Subject: Merge branch 'core/rcu' into core/locking, to prepare the kernel/locking/ file move X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ecf1f014325ba60f4df35edae1a357c67c5d4eb1;p=linux-beck.git Merge branch 'core/rcu' into core/locking, to prepare the kernel/locking/ file move 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 --- ecf1f014325ba60f4df35edae1a357c67c5d4eb1