Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

mariux64 · Jul 21, 2017 · 7a68ada · 7a68ada
2 parents 760446f + 96080f6
commit 7a68ada
Show file tree

Hide file tree

Showing 1,200 changed files with 38,137 additions and 18,852 deletions.
diff --git a/Documentation/ABI/testing/sysfs-class-mtd b/Documentation/ABI/testing/sysfs-class-mtd
@@ -229,6 +229,6 @@ KernelVersion:	4.1
 Contact:	linux-mtd@lists.infradead.org
 Description:
 		For a partition, the offset of that partition from the start
-		of the master device in bytes. This attribute is absent on
-		main devices, so it can be used to distinguish between
-		partitions and devices that aren't partitions.
+		of the parent (another partition or a flash device) in bytes.
+		This attribute is absent on flash devices, so it can be used
+		to distinguish them from partitions.