summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar2009-02-05 14:33:31 +0100
committerIngo Molnar2009-02-05 14:33:31 +0100
commit43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (patch)
tree8a7f36985f9ef8e6771163c751eeefd22ee71693 /Documentation
parenttrace: make the trace_event callbacks return enum print_line_t (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/coo... (diff)
downloadkernel-qcow2-linux-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.tar.gz
kernel-qcow2-linux-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.tar.xz
kernel-qcow2-linux-43769f10b4826376cbf4ce17af74a5b4e8dc4fcd.zip
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/ubifs.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/filesystems/ubifs.txt b/Documentation/filesystems/ubifs.txt
index 84da2a4ba25a..12fedb7834c6 100644
--- a/Documentation/filesystems/ubifs.txt
+++ b/Documentation/filesystems/ubifs.txt
@@ -79,13 +79,6 @@ Mount options
(*) == default.
-norm_unmount (*) commit on unmount; the journal is committed
- when the file-system is unmounted so that the
- next mount does not have to replay the journal
- and it becomes very fast;
-fast_unmount do not commit on unmount; this option makes
- unmount faster, but the next mount slower
- because of the need to replay the journal.
bulk_read read more in one go to take advantage of flash
media that read faster sequentially
no_bulk_read (*) do not bulk-read