diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /Documentation/filesystems/hpfs.txt | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'Documentation/filesystems/hpfs.txt')
| -rw-r--r-- | Documentation/filesystems/hpfs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/hpfs.txt b/Documentation/filesystems/hpfs.txt index 33dc360c8e89..38aba03efc5e 100644 --- a/Documentation/filesystems/hpfs.txt +++ b/Documentation/filesystems/hpfs.txt | |||
| @@ -274,7 +274,7 @@ History | |||
| 274 | Fixed race-condition in buffer code - it is in all filesystems in Linux; | 274 | Fixed race-condition in buffer code - it is in all filesystems in Linux; |
| 275 | when reading device (cat /dev/hda) while creating files on it, files | 275 | when reading device (cat /dev/hda) while creating files on it, files |
| 276 | could be damaged | 276 | could be damaged |
| 277 | 2.02 Woraround for bug in breada in Linux. breada could cause accesses beyond | 277 | 2.02 Workaround for bug in breada in Linux. breada could cause accesses beyond |
| 278 | end of partition | 278 | end of partition |
| 279 | 2.03 Char, block devices and pipes are correctly created | 279 | 2.03 Char, block devices and pipes are correctly created |
| 280 | Fixed non-crashing race in unlink (Alexander Viro) | 280 | Fixed non-crashing race in unlink (Alexander Viro) |