mirror of
https://github.com/hardkernel/linux.git
synced 2026-05-17 17:38:55 +09:00
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>