Merge tag 'v3.15' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / kernel / sched / cfs / fair.c
similarity index 100%
rename from kernel/sched/fair.c
rename to kernel/sched/cfs/fair.c