fix merge
Signed-off-by: Luis Cruz <ljc2491@gmail.com>
-use cfs for now
-also include sched_avg for bfs
Signed-off-by: Luis Cruz <ljc2491@gmail.com>
kernel: sched: Add wait_for_completion_io to BFS

-apply to 3.4
Signed-off-by: Luis Cruz <ljc2491@gmail.com>