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
parentsched: rework wakeup preemption (diff)
parentsched: fix init_hrtick() section mismatch warning (diff)
parentsched: compilation fix with gcc 3.4.6 (diff)
downloadlinux-63e5c39859a41591662466028c4d1281c033c05a.tar.xz
linux-63e5c39859a41591662466028c4d1281c033c05a.zip
Merge branches 'sched/urgent' and 'sched/rt' into sched/devel