]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc6a78f a39727f)
Merge ../linux-2.6/
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)
commitf28e71617ddaf2483e3e5c5237103484a303743f
tree67627d2d8ddbf6a4449371e9261d796c013b1fa1tree | snapshot
parentdc6a78f1af10d28fb8c395034ae1e099b85c05b0commit | diff
parenta39727f212426b9d5f9267b3318a2afaf9922d3bcommit | diff
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>
drivers/message/fusion/mptfc.c diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_init.c diff1 | diff2 | blob | history
Linux 2.6 source tree