diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /Documentation/scsi/aacraid.txt | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'Documentation/scsi/aacraid.txt')
| -rw-r--r-- | Documentation/scsi/aacraid.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt index 709ca991a451..ddace3afc83b 100644 --- a/Documentation/scsi/aacraid.txt +++ b/Documentation/scsi/aacraid.txt | |||
| @@ -128,7 +128,7 @@ Supported Cards/Chipsets | |||
| 128 | 128 | ||
| 129 | People | 129 | People |
| 130 | ------------------------- | 130 | ------------------------- |
| 131 | Alan Cox <alan@redhat.com> | 131 | Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 132 | Christoph Hellwig <hch@infradead.org> (updates for new-style PCI probing and SCSI host registration, | 132 | Christoph Hellwig <hch@infradead.org> (updates for new-style PCI probing and SCSI host registration, |
| 133 | small cleanups/fixes) | 133 | small cleanups/fixes) |
| 134 | Matt Domsch <matt_domsch@dell.com> (revision ioctl, adapter messages) | 134 | Matt Domsch <matt_domsch@dell.com> (revision ioctl, adapter messages) |