diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /Documentation/PCI/00-INDEX | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'Documentation/PCI/00-INDEX')
| -rw-r--r-- | Documentation/PCI/00-INDEX | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/PCI/00-INDEX b/Documentation/PCI/00-INDEX index 49f43946c6b6..812b17fe3ed0 100644 --- a/Documentation/PCI/00-INDEX +++ b/Documentation/PCI/00-INDEX | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 00-INDEX | 1 | 00-INDEX |
| 2 | - this file | 2 | - this file |
| 3 | MSI-HOWTO.txt | ||
| 4 | - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ. | ||
| 3 | PCI-DMA-mapping.txt | 5 | PCI-DMA-mapping.txt |
| 4 | - info for PCI drivers using DMA portably across all platforms | 6 | - info for PCI drivers using DMA portably across all platforms |
| 5 | PCIEBUS-HOWTO.txt | 7 | PCIEBUS-HOWTO.txt |