Merge commit 'fixes.2015.02.23a' into core/rcu
Conflicts:
kernel/rcu/tree.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Showing
- include/linux/compiler.h 8 additions, 4 deletionsinclude/linux/compiler.h
- include/linux/irq.h 4 additions, 2 deletionsinclude/linux/irq.h
- include/linux/rcupdate.h 0 additions, 2 deletionsinclude/linux/rcupdate.h
- include/linux/srcu.h 17 additions, 2 deletionsinclude/linux/srcu.h
- kernel/irq/internals.h 4 additions, 0 deletionskernel/irq/internals.h
- kernel/rcu/rcutorture.c 8 additions, 6 deletionskernel/rcu/rcutorture.c
- kernel/rcu/tiny_plugin.h 2 additions, 13 deletionskernel/rcu/tiny_plugin.h
- kernel/rcu/tree.c 70 additions, 73 deletionskernel/rcu/tree.c
- kernel/rcu/tree.h 31 additions, 11 deletionskernel/rcu/tree.h
- kernel/rcu/tree_plugin.h 13 additions, 14 deletionskernel/rcu/tree_plugin.h
- scripts/checkpatch.pl 2 additions, 1 deletionscripts/checkpatch.pl
Please register or sign in to comment