diff --git a/[refs] b/[refs] index a6bfed9c3fb3..b5fca0b31e9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38b6f45a97bbb8536cc7d095b577f580bd4d643e +refs/heads/master: af41d7bd9b685ab4e8f930627874ba4f4728e128 diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c index a6809645d212..c1a39d90d14a 100644 --- a/trunk/block/blk-cgroup.c +++ b/trunk/block/blk-cgroup.c @@ -811,8 +811,6 @@ static int blkiocg_weight_device_read(struct cgroup *cgrp, struct cftype *cft, struct blkio_cgroup *blkcg; struct blkio_policy_node *pn; - seq_printf(m, "dev\tweight\n"); - blkcg = cgroup_to_blkio_cgroup(cgrp); if (!list_empty(&blkcg->policy_list)) { spin_lock_irq(&blkcg->lock);