]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:26:59 +0000 (12:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:26:59 +0000 (12:26 +0200)
commiteff022769666e3d110926b9548f9a60a31e0d988
treefec11fec6cf8e2454e07bd04ac137cad85075611
parent62cdc8e7d18e96044fc3b1c49ed9442371fd98eb
parent34246e4c502ac282633f3eafc395e419462ff184
Merge branch 'linus' into sched/devel

Conflicts:

kernel/sched_rt.c

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