diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
commit | 80cc38b16389849a6e06441ace4530f6b2497c3c (patch) | |
tree | 1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /Documentation/filesystems | |
parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) | |
parent | 83a35e360433b58791bc9c4e288cace466d62e3a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual stuff from trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
treewide: relase -> release
Documentation/cgroups/memory.txt: fix stat file documentation
sysctl/net.txt: delete reference to obsolete 2.4.x kernel
spinlock_api_smp.h: fix preprocessor comments
treewide: Fix typo in printk
doc: device tree: clarify stuff in usage-model.txt.
open firmware: "/aliasas" -> "/aliases"
md: bcache: Fixed a typo with the word 'arithmetic'
irq/generic-chip: fix a few kernel-doc entries
frv: Convert use of typedef ctl_table to struct ctl_table
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
doc: clk: Fix incorrect wording
Documentation/arm/IXP4xx fix a typo
Documentation/networking/ieee802154 fix a typo
Documentation/DocBook/media/v4l fix a typo
Documentation/video4linux/si476x.txt fix a typo
Documentation/virtual/kvm/api.txt fix a typo
Documentation/early-userspace/README fix a typo
Documentation/video4linux/soc-camera.txt fix a typo
lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
...
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/jfs.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/qnx6.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/vfat.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/filesystems/jfs.txt b/Documentation/filesystems/jfs.txt index f7433355394a..41fd757997b3 100644 --- a/Documentation/filesystems/jfs.txt +++ b/Documentation/filesystems/jfs.txt | |||
@@ -42,7 +42,7 @@ nodiscard(*) block device when blocks are freed. This is useful for SSD | |||
42 | devices and sparse/thinly-provisioned LUNs. The FITRIM ioctl | 42 | devices and sparse/thinly-provisioned LUNs. The FITRIM ioctl |
43 | command is also available together with the nodiscard option. | 43 | command is also available together with the nodiscard option. |
44 | The value of minlen specifies the minimum blockcount, when | 44 | The value of minlen specifies the minimum blockcount, when |
45 | a TRIM command to the block device is considered usefull. | 45 | a TRIM command to the block device is considered useful. |
46 | When no value is given to the discard option, it defaults to | 46 | When no value is given to the discard option, it defaults to |
47 | 64 blocks, which means 256KiB in JFS. | 47 | 64 blocks, which means 256KiB in JFS. |
48 | The minlen value of discard overrides the minlen value given | 48 | The minlen value of discard overrides the minlen value given |
diff --git a/Documentation/filesystems/qnx6.txt b/Documentation/filesystems/qnx6.txt index e59f2f09f56e..99e90184a72f 100644 --- a/Documentation/filesystems/qnx6.txt +++ b/Documentation/filesystems/qnx6.txt | |||
@@ -148,7 +148,7 @@ smaller than addressing space in the bitmap. | |||
148 | Bitmap system area | 148 | Bitmap system area |
149 | ------------------ | 149 | ------------------ |
150 | 150 | ||
151 | The bitmap itself is devided into three parts. | 151 | The bitmap itself is divided into three parts. |
152 | First the system area, that is split into two halfs. | 152 | First the system area, that is split into two halfs. |
153 | Then userspace. | 153 | Then userspace. |
154 | 154 | ||
diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt index 4a93e98b290a..aa1f459fa6cf 100644 --- a/Documentation/filesystems/vfat.txt +++ b/Documentation/filesystems/vfat.txt | |||
@@ -307,7 +307,7 @@ the following: | |||
307 | 307 | ||
308 | <proceeding files...> | 308 | <proceeding files...> |
309 | <slot #3, id = 0x43, characters = "h is long"> | 309 | <slot #3, id = 0x43, characters = "h is long"> |
310 | <slot #2, id = 0x02, characters = "xtension whic"> | 310 | <slot #2, id = 0x02, characters = "xtension which"> |
311 | <slot #1, id = 0x01, characters = "My Big File.E"> | 311 | <slot #1, id = 0x01, characters = "My Big File.E"> |
312 | <directory entry, name = "MYBIGFIL.EXT"> | 312 | <directory entry, name = "MYBIGFIL.EXT"> |
313 | 313 | ||