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

author	Paul E. McKenney <paulmck@linux.vnet.ibm.com>
	Fri, 3 Aug 2012 15:56:17 +0000 (08:56 -0700)
committer	Paul E. McKenney <paulmck@linux.vnet.ibm.com>
	Fri, 3 Aug 2012 15:56:17 +0000 (08:56 -0700)
commit	d1d61c117a7be3ad34bee463ef657f6f51b3046f
tree	75fc8f88f5003ef8aad55d9cb4c1dbc4b6b12b40	tree \| snapshot
parent	ce6e1de8c783d1b444f2ff315756d258f741f307	commit \| diff
parent	a0086813374fa2922ed7edc85146aa351735501f	commit \| diff
parent	3d1ade7523fb98fd95473add0cefeb68aa01a2b2	commit \| diff
parent	55b35adfd0d8f23abe81d56cc9ac97e8c9bacb0c	commit \| diff
parent	b34d03aeb2e0babd542b8132d32fcc82d15e129d	commit \| diff

Merge branches 'bigrt.2012.07.31a', 'doctorture.2012.08.03a', 'fixes.2012.08.03a', 'hotplug.2012.08.03a' and 'idle.2012.07.31a' into dev.3.7.2012.08.03a

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