James Bottomley f28e71617d 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 <[email protected]>

2006-06-28 14:06:39 -04:00

..

fusion

Merge ../linux-2.6/

2006-06-28 14:06:39 -04:00

i2o

[PATCH] drivers/message/i2o/iop.c: unexport i2o_msg_nop()

2006-06-27 17:32:48 -07:00

Makefile

…