diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2010-02-16 16:48:56 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-16 16:48:56 +0100 |
| commit | 6e40f5bbbc734231bc5809d3eb785e3c21f275d7 (patch) | |
| tree | 8520fc84d9643502ebe86233cefcd774e2babf72 /mm/hugetlb.c | |
| parent | kthread, sched: Remove reference to kthread_create_on_cpu (diff) | |
| parent | sched: Fix race between ttwu() and task_rq_lock() (diff) | |
| download | wireguard-linux-6e40f5bbbc734231bc5809d3eb785e3c21f275d7.tar.xz wireguard-linux-6e40f5bbbc734231bc5809d3eb785e3c21f275d7.zip | |
Merge branch 'sched/urgent' into sched/core
Conflicts: kernel/sched.c
Necessary due to the urgent fixes which conflict with the code move
from sched.c to sched_fair.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'mm/hugetlb.c')
0 files changed, 0 insertions, 0 deletions