| commit | ecf1f014325ba60f4df35edae1a357c67c5d4eb1 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Nov 06 07:43:37 2013 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Nov 06 07:43:37 2013 +0100 |
| tree | 38786562c25d738bed0e22ed8d615e5a7b27c0c7 | |
| parent | 97c53b402fcadb50201c23914f614bf8430d9c20 [diff] | |
| parent | 0e95c69bde1a5bf22acd53b356fe10d7bec6e2be [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>