Merge ../linux-2.6/

author James Bottomley <[email protected]>

Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)

committer James Bottomley <[email protected]>

Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)
author James Bottomley <[email protected]>
Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)
committer James Bottomley <[email protected]>
Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)
diff --cc drivers/message/fusion/mptfc.c
Simple merge
diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge
author	James Bottomley <[email protected]>
	Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)
committer	James Bottomley <[email protected]>
	Wed, 28 Jun 2006 18:06:39 +0000 (14:06 -0400)
		1	2
drivers/message/fusion/mptfc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qla2xxx/qla_init.c	patch \|	diff1 \|	diff2 \|	blob \| history