Fix BFQ for 54766d4
Merge branch '3.11/bfq' into 3.11/master