merge by hand (qla_os.c mismerge)
[linux-2.6] / drivers / s390 / scsi / zfcp_def.h
2005-06-18  James Bottomleymerge by hand (qla_os.c mismerge)
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-14  Andreas Herrmann[SCSI] zfcp: fix handling of port boxed and lun boxed...
2005-06-14  Andreas Herrmann[SCSI] zfcp: fix bug during adapter shutdown
2005-06-14  Andreas Herrmann[SCSI] zfcp: fix: problem in send_els_handler when...
2005-06-14  Andreas Herrmann[SCSI] zfcp: fix: allow more time for adapter initializ...
2005-06-11  Andreas Herrmann[SCSI] zfcp: remove flags_dump feature
2005-05-27  Christoph HellwigMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-09  Tony LuckMerge with /home/aegl/GIT/linus
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-04-21  Andreas Herrmann[SCSI] zfcp: fix compile error
2005-04-18  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-rmk.git
2005-04-18  Linus TorvaldsMerge SCSI tree from James Bottomley.
2005-04-18  James Bottomleymerge by hand (scsi_device.h)
2005-04-18   <jejb@titanic.il... zfcp: add point-2-point support
2005-04-17   <jejb@titanic.il... zfcp: add point-2-point support
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2