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 /arch/x86/include/asm/alternative.h | |
| parent | 301ba0457f1ed853fc08e57785f8c87fe7e49c68 (diff) | |
| parent | 0970d2992dfd7d5ec2c787417cf464f01eeaf42a (diff) | |
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 'arch/x86/include/asm/alternative.h')
0 files changed, 0 insertions, 0 deletions