Conflicts:

	drivers/scsi/aacraid/comminit.c

Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>