Merge branches 'sched/urgent' and 'sched/rt' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 23 Sep 2008 14:23:05 +0000 (16:23 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Sep 2008 14:23:05 +0000 (16:23 +0200)
commit63e5c39859a41591662466028c4d1281c033c05a
tree1fbb0c2b76673e9557688ee607aa61d92855bebe
parent695698500912c4479ddf4723e492de3970ff8530
parentfa748203175de7c08f2df80e5a0eeca40329b5e2
parentc8bfff6dd4d41834f4952cbc49e28e31906a6188
Merge branches 'sched/urgent' and 'sched/rt' into sched/devel
kernel/sched.c
kernel/sched_rt.c