]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
drivers/message/fusion/mptfc.c patch | diff1 | diff2 | blob | history
drivers/scsi/qla2xxx/qla_init.c patch | diff1 | diff2 | blob | history

diff --cc drivers/message/fusion/mptfc.c
Simple merge
diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge
Linux 2.6 source tree