From: Linus Torvalds Date: Fri, 13 Jul 2007 17:12:21 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aba2da66cfbf7790ad79d4dee95871127d5ddf5e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge git://git./linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: [PATCH] sched: small topology.h cleanup [PATCH] sched: fix show_task()/show_tasks() output [PATCH] sched: remove stale version info from kernel/sched_debug.c [PATCH] sched: allow larger granularity [PATCH] sched: fix prio_to_wmult[] for nice 1 [ I re-did the commits to get rid of some bogus merge commit that Ingo had. - Linus ] Signed-off-by: Linus Torvalds --- aba2da66cfbf7790ad79d4dee95871127d5ddf5e