summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-06-11 00:46:44 +0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-06-11 00:46:44 +0400
commitbe77f87c001b770f13fe742becb08b847d9542f1 (patch)
tree0dc068c57aee1f87a70eae31f3ad8ecc7e4eb702
parent05eb552bf5ed9e7277bdc9c273ed2f4e9b7dc3e5 (diff)
parentf7bac9b85a333ebdfa5f500cf6acf753edffc05f (diff)
parent676c3dc2033aa43f2e605611dec9be55a921dafd (diff)
parent505d6421bd520c42dd6141aaeff91605e148583f (diff)
parent14961444696effb2e660fe876e5c1880f8bc3932 (diff)
downloadlinux-be77f87c001b770f13fe742becb08b847d9542f1.tar.xz
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.