]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 23 Oct 2012 22:15:10 +0000 (15:15 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 23 Oct 2012 22:15:10 +0000 (15:15 -0700)
commit1a0ec9cc029e83146e4070297903757948a18bbb
treed72ff5826640578be256a8930e9b464826dd32f1
parentec97d8cc8d0063d5ab3ab2db225b844b62f440cd
parent06253e28c8c82eb4f68a5568334df535972cbc0e
Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d

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