diff --git a/[refs] b/[refs] index da034979f3b4..0cf99ea1906b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcab1e51796d8bcd1a7969ff52bd904d38748e00 +refs/heads/master: 5be0e9511990dc307670dc66a42073db96b20f26 diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 1d24fead51a6..826c131994c3 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -312,7 +312,7 @@ static void *devinfo_next(struct seq_file *f, void *v, loff_t *pos) case BLK_HDR: info->state = BLK_LIST; (*pos)++; - break; + /*fallthrough*/ case BLK_LIST: if (get_blkdev_info(info->blkdev,&idummy,&ndummy)) { /*