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/00-INDEX | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'Documentation/00-INDEX')
| -rw-r--r-- | Documentation/00-INDEX | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 02457ec9c94f..f08ca9535733 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX | |||
| @@ -104,8 +104,6 @@ firmware_class/ | |||
| 104 | - request_firmware() hotplug interface info. | 104 | - request_firmware() hotplug interface info. |
| 105 | floppy.txt | 105 | floppy.txt |
| 106 | - notes and driver options for the floppy disk driver. | 106 | - notes and driver options for the floppy disk driver. |
| 107 | ftape.txt | ||
| 108 | - notes about the floppy tape device driver. | ||
| 109 | hayes-esp.txt | 107 | hayes-esp.txt |
| 110 | - info on using the Hayes ESP serial driver. | 108 | - info on using the Hayes ESP serial driver. |
| 111 | highuid.txt | 109 | highuid.txt |