tree 8520fc84d9643502ebe86233cefcd774e2babf72
parent 301ba0457f1ed853fc08e57785f8c87fe7e49c68
parent 0970d2992dfd7d5ec2c787417cf464f01eeaf42a
author Thomas Gleixner <tglx@linutronix.de> 1266335336 +0100
committer Thomas Gleixner <tglx@linutronix.de> 1266335336 +0100

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>