Commit f28e7161 authored Jun 28, 2006 by James Bottomley

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>

parents dc6a78f1 a39727f2

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 515+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment