diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-17 03:58:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-17 03:58:25 -0400 |
| commit | bb3c3e807140816b5f5fd4840473ee52a916ad4f (patch) | |
| tree | 9e8a69d266a7df86ca16177eefffab4b4e910753 /Documentation/filesystems/vfat.txt | |
| parent | 595c36490deb49381dc51231a3d5e6b66786ed27 (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
Merge commit 'v2.6.32-rc5' into perf/probes
Conflicts:
kernel/trace/trace_event_profile.c
Merge reason: update to -rc5 and resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/filesystems/vfat.txt')
| -rw-r--r-- | Documentation/filesystems/vfat.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt index b58b84b50fa2..eed520fd0c8e 100644 --- a/Documentation/filesystems/vfat.txt +++ b/Documentation/filesystems/vfat.txt | |||
| @@ -102,7 +102,7 @@ shortname=lower|win95|winnt|mixed | |||
| 102 | winnt: emulate the Windows NT rule for display/create. | 102 | winnt: emulate the Windows NT rule for display/create. |
| 103 | mixed: emulate the Windows NT rule for display, | 103 | mixed: emulate the Windows NT rule for display, |
| 104 | emulate the Windows 95 rule for create. | 104 | emulate the Windows 95 rule for create. |
| 105 | Default setting is `lower'. | 105 | Default setting is `mixed'. |
| 106 | 106 | ||
| 107 | tz=UTC -- Interpret timestamps as UTC rather than local time. | 107 | tz=UTC -- Interpret timestamps as UTC rather than local time. |
| 108 | This option disables the conversion of timestamps | 108 | This option disables the conversion of timestamps |