]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'doc.2012.10.23c', 'fixes.2012.10.27a', 'srcu.2012.10.27a', 'stall...
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Sat, 27 Oct 2012 23:01:16 +0000 (16:01 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Sat, 27 Oct 2012 23:01:16 +0000 (16:01 -0700)
commit495f36543f5aaff9bc7ff8296bc9a0e0c8585ab4
treee6f82a23e0e7fbdb7d6bcb39f3d694061ca75a71
parent2c5594df344cd1ff0cc9bf007dea3235582b3acf
parentac89f16bda9ba5a303d16629ef21a6fa16835bc4
parent57d056411f484f5a884a34941b9b4a9c8a5ea7a7
parentcda4dc813071e6cb04944c5a140610bd06acd295
parentae1fd42eb7a0f82c0c11742b7dc378e40c3f7de5
parentcdca99518508d7c6ce3957251ce86e93be5dff81
parentaf71befa282ddf51c09509978abe1e83de8fe7eb
Merge branches 'doc.2012.10.23c', 'fixes.2012.10.27a', 'srcu.2012.10.27a', 'stall.2012.10.24a', 'tracing.2012.10.27a' and 'idle.2012.10.24a' into HEAD

Resolved conflicts:
kernel/rcu.h
kernel/rcupdate.c
kernel/rcutree.c
13 files changed:
Documentation/RCU/whatisRCU.txt
include/linux/rcupdate.h
include/linux/sched.h
kernel/rcu.h
kernel/rcupdate.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