]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'urgent.2012.10.27a', 'doc.2012.11.08a', 'fixes.2012.11.08a', 'srcu...
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 8 Nov 2012 20:00:12 +0000 (12:00 -0800)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Thu, 8 Nov 2012 20:00:12 +0000 (12:00 -0800)
commitb3ef3d51826397b11dd00efcb1dd79493c55838d
tree4e2b1ed96c30eb1babd9f190b4bbf25c6937df72
parent2c5594df344cd1ff0cc9bf007dea3235582b3acf
parent4fa3f6665467630867ab8ea27fcbe78d52b38429
parent01c47e7892e72013e394214bb72076499b8e5521
parentcda4dc813071e6cb04944c5a140610bd06acd295
parentae1fd42eb7a0f82c0c11742b7dc378e40c3f7de5
parent7bd8f2a74bcbd39f4277766f4d49441c45dd10a0
parentaf71befa282ddf51c09509978abe1e83de8fe7eb
Merge branches 'urgent.2012.10.27a', 'doc.2012.11.08a', 'fixes.2012.11.08a', 'srcu.2012.10.27a', 'stall.2012.10.24a', 'tracing.2012.11.08a' and 'idle.2012.10.24a' into HEAD

Resolved conflicts:
kernel/rcu.h
kernel/rcupdate.c
kernel/rcutree.c
14 files changed:
Documentation/RCU/whatisRCU.txt
include/linux/rcupdate.h
include/linux/sched.h
kernel/rcu.h
kernel/rcupdate.c
kernel/rcutiny.c
kernel/rcutiny_plugin.h
kernel/rcutorture.c
kernel/rcutree.c
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/sched/core.c
kernel/srcu.c
lib/Kconfig.debug