Fixes for !CGROUP_BFQIO
Merge branch '3.14/bfq' into 3.14/master
Merge remote-tracking branch 'zen-kernel/3.14/master' into 3.14
Bump version to 3.14.1-r2