summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-23 16:23:05 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-23 16:23:05 +0200
commit63e5c39859a41591662466028c4d1281c033c05a (patch)
tree1fbb0c2b76673e9557688ee607aa61d92855bebe /kernel
parent695698500912c4479ddf4723e492de3970ff8530 (diff)
parentfa748203175de7c08f2df80e5a0eeca40329b5e2 (diff)
parentc8bfff6dd4d41834f4952cbc49e28e31906a6188 (diff)
Merge branches 'sched/urgent' and 'sched/rt' into sched/devel