diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-06 07:43:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 07:43:37 +0100 |
| commit | ecf1f014325ba60f4df35edae1a357c67c5d4eb1 (patch) | |
| tree | 38786562c25d738bed0e22ed8d615e5a7b27c0c7 /include/trace/events/sched.h | |
| parent | Merge tag 'v3.12' into core/locking to pick up mutex upates (diff) | |
| parent | Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paul... (diff) | |
| download | linux-ecf1f014325ba60f4df35edae1a357c67c5d4eb1.tar.xz linux-ecf1f014325ba60f4df35edae1a357c67c5d4eb1.zip | |
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>
Diffstat (limited to 'include/trace/events/sched.h')
0 files changed, 0 insertions, 0 deletions