sched upstream

Conflicts:

	arch/arm/mach-msm/msm_rq_stats.c