diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/scsi/ppa.h | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/ppa.h')
| -rw-r--r-- | drivers/scsi/ppa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ppa.h b/drivers/scsi/ppa.h index f6e1a1574bb8..7511df3588e4 100644 --- a/drivers/scsi/ppa.h +++ b/drivers/scsi/ppa.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * the Iomega ZIP drive | 2 | * the Iomega ZIP drive |
| 3 | * | 3 | * |
| 4 | * (c) 1996 Grant R. Guenther grant@torque.net | 4 | * (c) 1996 Grant R. Guenther grant@torque.net |
| 5 | * David Campbell campbell@torque.net | 5 | * David Campbell |
| 6 | * | 6 | * |
| 7 | * All comments to David. | 7 | * All comments to David. |
| 8 | */ | 8 | */ |