blkcg: collapse blkcg_policy_ops into blkcg_policy

There's no reason to keep blkcg_policy_ops separate.  Collapse it into
blkcg_policy.

This patch doesn't introduce any functional change.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc block/blk-cgroup.c
Simple merge

diff --cc block/blk-cgroup.h
Simple merge

diff --cc block/blk-throttle.c
Simple merge

diff --cc block/cfq-iosched.c
Simple merge