]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'doc.2012.10.30a', 'fixes.2012.10.30a', 'srcu.2012.10.27a', 'stall...
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 30 Oct 2012 13:43:22 +0000 (06:43 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 30 Oct 2012 13:43:22 +0000 (06:43 -0700)
commit155f74419b6034ccd436585b6f0cdb48c5162988
tree70cd3594bc9072ae556cf82cdc924c8b25c565d1
parent2c5594df344cd1ff0cc9bf007dea3235582b3acf
parent8413826a748e322a182e627268601b18f15bab31
parent2ff0f2060918b13ae935ee16f12296a3f2bcd38f
parentcda4dc813071e6cb04944c5a140610bd06acd295
parentae1fd42eb7a0f82c0c11742b7dc378e40c3f7de5
parente5b16092939a0590bb4e0af04481a10c233d2f74
parentaf71befa282ddf51c09509978abe1e83de8fe7eb
Merge branches 'doc.2012.10.30a', 'fixes.2012.10.30a', 'srcu.2012.10.27a', 'stall.2012.10.24a', 'tracing.2012.10.30a' and 'idle.2012.10.24a' into HEAD

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