Merge master.kernel.org:/home/davem/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

fs/partitions/check.c

@@ -294,7 +294,7 @@ static ssize_t part_attr_show(struct kobject * kobj, struct attribute * attr,
 	struct part_attribute * part_attr = container_of(attr,struct part_attribute,attr);
 	ssize_t ret = 0;
 	if (part_attr->show)
-		part_attr->show(p,page,count,off);
+		ret = part_attr->show(p,page,count,off);
 	return ret;
 }