bye bfq

Conflicts:
	block/bfq-cgroup.c
	block/bfq-ioc.c
	block/bfq-iosched.c
	block/bfq-sched.c
	block/bfq.h
block: introduce the BFQ-v6r2 I/O sched for 3.3
block, bfq: add Early Queue Merge (EQM) to BFQ-v6r2 for 3.3.0
block: bfq, blk: fix compilation error
block: bfq: Squashed update from v6r2 to v7

Conflicts:
	block/bfq-cgroup.c
	block/bfq.h

Conflicts:
	block/bfq-cgroup.c
	block/bfq-sched.c