projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 97c53b4 0e95c69)
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)
commitecf1f014325ba60f4df35edae1a357c67c5d4eb1
tree38786562c25d738bed0e22ed8d615e5a7b27c0c7tree | snapshot
parent97c53b402fcadb50201c23914f614bf8430d9c20commit | diff
parent0e95c69bde1a5bf22acd53b356fe10d7bec6e2becommit | 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
Unnamed repository; edit this file 'description' to name the repository.