git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Paul E. McKenney <paulmck@linux.vnet.ibm.com>
	Wed, 5 Sep 2012 19:09:42 +0000 (12:09 -0700)
committer	Paul E. McKenney <paulmck@linux.vnet.ibm.com>
	Wed, 5 Sep 2012 19:09:42 +0000 (12:09 -0700)
commit	85d4383f894d8bea2bf8f0c936690ce2a2512735
tree	e915d6ef6c73982384f61999197b70d4c212595a	tree \| snapshot
parent	82dd45e1a997982ec689d2c0788645129c33cfe2	commit \| diff
parent	a1551aca2d7084560240df769cf0eec5b7a4ced3	commit \| diff
parent	ed61a18a8ecf42dc97fda769c02b5b5f0042e501	commit \| diff
parent	fef8f3efbe26fed13a8a511784f0f13a4a6604c8	commit \| diff
parent	dea42dc2282b9c8f78eb1fb6c4a0c81d700dd31c	commit \| diff

Merge branches 'bigrt.2012.09.05a', 'doctorture.2012.09.04a', 'fixes.2012.09.04a', 'hotplug.2012.09.04a' and 'idle.2012.09.04a' into HEAD

Conflicts:
kernel/rcutree.c

include/linux/rcupdate.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/rcutree.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/rcutree.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/rcutree_plugin.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/rcutree_trace.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history