diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-01-29 07:25:02 +0100 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-01-29 07:25:21 +0100 |
| commit | 40393f525fe698e2b639cf1851ef0a40e7e158a8 (patch) | |
| tree | 4067b416468413225a8ac8c75c43859fe3b03bb5 /include/trace/events/rcu.h | |
| parent | rcu: Make rcutorture's shuffler task shuffle recently added tasks (diff) | |
| parent | context_tracking: Add comments on interface and internals (diff) | |
| parent | rcu: Trace callback acceleration (diff) | |
| parent | rcu: Allow TREE_PREEMPT_RCU on UP systems (diff) | |
| download | linux-40393f525fe698e2b639cf1851ef0a40e7e158a8.tar.xz linux-40393f525fe698e2b639cf1851ef0a40e7e158a8.zip | |
Merge branches 'doctorture.2013.01.29a', 'fixes.2013.01.26a', 'tagcb.2013.01.24a' and 'tiny.2013.01.29b' into HEAD
doctorture.2013.01.11a: Changes to rcutorture and to RCU documentation.
fixes.2013.01.26a: Miscellaneous fixes.
tagcb.2013.01.24a: Tag RCU callbacks with grace-period number to
simplify callback advancement.
tiny.2013.01.29b: Enhancements to uniprocessor handling in tiny RCU.