| commit | f28e71617ddaf2483e3e5c5237103484a303743f | [log] [tgz] |
|---|---|---|
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | Wed Jun 28 14:06:39 2006 -0400 |
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | Wed Jun 28 14:06:39 2006 -0400 |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 | |
| 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>