diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-06-10 13:46:44 -0700 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-06-10 13:46:44 -0700 |
commit | be77f87c001b770f13fe742becb08b847d9542f1 (patch) | |
tree | 0dc068c57aee1f87a70eae31f3ad8ecc7e4eb702 /init/Kconfig | |
parent | 05eb552bf5ed9e7277bdc9c273ed2f4e9b7dc3e5 (diff) | |
parent | f7bac9b85a333ebdfa5f500cf6acf753edffc05f (diff) | |
parent | 676c3dc2033aa43f2e605611dec9be55a921dafd (diff) | |
parent | 505d6421bd520c42dd6141aaeff91605e148583f (diff) | |
parent | 14961444696effb2e660fe876e5c1880f8bc3932 (diff) | |
download | op-kernel-dev-be77f87c001b770f13fe742becb08b847d9542f1.zip op-kernel-dev-be77f87c001b770f13fe742becb08b847d9542f1.tar.gz |
Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD
cbnum.2013.06.10a: Apply simplifications stemming from the new callback
numbering.
doc.2013.06.10a: Documentation updates.
fixes.2013.06.10a: Miscellaneous fixes.
srcu.2013.06.10a: Updates to SRCU.
tiny.2013.06.10a: Eliminate TINY_PREEMPT_RCU.