Merge changes I8533887c,I5b6dc7a6 into msm-3.4

* changes:
  msm_rmnet: add ioctl to enable/disable flow on prio qdisc
  net: sched: export an api to enable/disable flow on sch