err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7015faa ee807c2)

author	James Bottomley <jejb@titanic.(none)>
	Sat, 5 Nov 2005 04:29:52 +0000 (22:29 -0600)
committer	James Bottomley <jejb@titanic.(none)>
	Sat, 5 Nov 2005 04:29:52 +0000 (22:29 -0600)
commit	849a8924a6740ecbf9711e015beca69425f0c429
tree	2bae44c5fb170a655696b7253eec7ee13c6fa437	tree \| snapshot
parent	7015faa7df829876a0f931cd18aa6d7c24a1b581	commit \| diff
parent	ee807c2d43b54183c16580857837dae8ccb2ed22	commit \| diff

Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/ch.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/dec_esp.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hosts.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ide-scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/osst.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_transport_fc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_transport_iscsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sg.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/st.c	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_transport_fc.h	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree