diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /Documentation/00-INDEX | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
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 |