From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Wed, 28 Jun 2006 18:06:39 +0000 (-0400)
Subject: Merge ../linux-2.6/
X-Git-Tag: v2.6.18-rc1~22^2^2~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f28e71617ddaf2483e3e5c5237103484a303743f;p=linux-2.6

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>
---

f28e71617ddaf2483e3e5c5237103484a303743f