msm: intelli_plug: merged scheduler patches for intelli plug - v3.7

Conflicts:
	kernel/sched/sched.h