tree d72ff5826640578be256a8930e9b464826dd32f1
parent ec97d8cc8d0063d5ab3ab2db225b844b62f440cd
parent 06253e28c8c82eb4f68a5568334df535972cbc0e
author Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1351030510 -0700
committer Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1351030510 -0700

Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d

Resolved adjacent-change conflicts for kernel/rcutree.c.