Fixes for !CGROUP_BFQIO
Merge branch '3.14/bfq' into 3.14/master