Skip to content

Commit 7a68ada

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2 parents 760446f + 96080f6 commit 7a68ada

File tree

1,200 files changed

+38137
-18852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,200 files changed

+38137
-18852
lines changed

Documentation/ABI/testing/sysfs-class-mtd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,6 @@ KernelVersion: 4.1
229229
Contact: linux-mtd@lists.infradead.org
230230
Description:
231231
For a partition, the offset of that partition from the start
232-
of the master device in bytes. This attribute is absent on
233-
main devices, so it can be used to distinguish between
234-
partitions and devices that aren't partitions.
232+
of the parent (another partition or a flash device) in bytes.
233+
This attribute is absent on flash devices, so it can be used
234+
to distinguish them from partitions.

0 commit comments

Comments
 (0)