diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-01-28 22:25:02 -0800 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-01-28 22:25:21 -0800 |
| commit | 40393f525fe698e2b639cf1851ef0a40e7e158a8 (patch) | |
| tree | 4067b416468413225a8ac8c75c43859fe3b03bb5 /drivers/input/keyboard/tca8418_keypad.c | |
| parent | 0e11c8e8a60f8591556d142c2e1e53eaf86ab528 (diff) | |
| parent | 4eacdf18374e5d7d21a728b46dfec269ac8ef55c (diff) | |
| parent | 6d4b418c75a74eea1dd3701e106a9da8c335c451 (diff) | |
| parent | 9fc52d832b5e7f6e175f3b20ae94504b780b9fd3 (diff) | |
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.