]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ba1991 466ea37)
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)
commite11db134a08a003803912833979fbf47c3d91794
tree38786562c25d738bed0e22ed8d615e5a7b27c0c7tree | snapshot
parent3ba1991eb8fa1a7298f51f9988b059e5cbcb2fc7commit | diff
parent466ea374e4f9916589c2801a01c6022d5f057e4ccommit | diff
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 <mingo@kernel.org>
MAINTAINERS diff1 | diff2 | blob | history
Linux Kernel Source Tree.