msm_rq_stats: squash commit to latest version

Conflicts:
	arch/arm/mach-msm/msm_rq_stats.c

Change-Id: I73ca3917f0c2dfd26cdf8e28e8c27dc8eceeac4f