bbs.cooldavid.org Git - net-next-2.6.git/commit

]> bbs.cooldavid.org Git - net-next-2.6.git/commit

git://bbs.cooldavid.org / net-next-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 68c38fc cd5b8f8)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 21 Jul 2010 19:45:02 +0000 (21:45 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 21 Jul 2010 19:45:08 +0000 (21:45 +0200)
commit	dca45ad8af54963c005393a484ad117b8ba6150f
tree	7c9a6966283a6bb12b54e5680a67d203be292930	tree \| snapshot (tar.bz2 tar.gz zip)
parent	68c38fc3cb4e5a60f502ee9c45f3dfe70e5165ad	commit \| diff
parent	cd5b8f8755a89a57fc8c408d284b8b613f090345	commit \| diff

Merge branch 'linus' into sched/core

Merge reason: Move from the -rc3 to the almost-rc6 base.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/powerpc/kernel/process.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_fair.c	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	diff1 \|	diff2 \|	blob \| history

Clone of davem's net-next-2.6 tree