]> git.baikalelectronics.ru Git - kernel.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)
commit7391ecbe1c299cf135cbe11bd1c0751968901237
tree58caef683e4739907e0ae147bead71a5b19e2207
parentd5dcbe2099f77819d4d3a08ef1c4af63ea6aca27
parentb8786d50dd5a53c9c926a4318c2c04ccb92363e4
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