aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-08 20:12:46 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-08 20:12:46 +0100
commit140573d33b703194b7e1893711e78b7f546cca7c (patch)
tree8e215102e7c5222013df84ceed8b961728d2db91 /kernel
parent34cb61359b503d7aff6447acb037a5efd6ce93b2 (diff)
parentceacc2c1c85ac498ca4cf297bdfe5b4aaa9fd0e0 (diff)
parent483b4ee60edbefdfbff0dd538fb81f368d9e7c0d (diff)
Merge branches 'sched/rt' and 'sched/urgent' into sched/core