]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'sched' into sched-devel
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Jun 2008 07:09:15 +0000 (09:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Jun 2008 07:09:15 +0000 (09:09 +0200)
commit1cdad71537b42d0f0bf247772942ce678e4e8898
tree58caef683e4739907e0ae147bead71a5b19e2207
parent20b6331bfed1f07ba1e5006889a5d64adc53615e
parent15a8641eadb492ef7c5489faa25256967bdfd303
Merge branch 'sched' into sched-devel

Conflicts:

kernel/sched_rt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c
kernel/sched_rt.c