Merge by hand (conflicts in sd.c)
[linux-2.6] / drivers / s390 / scsi / zfcp_scsi.c
2005-09-06  James BottomleyMerge by hand (conflicts in sd.c)
2005-08-28  James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-tmp
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-28  Linus TorvaldsMerge refs/heads/upstream-fixes from /linux/kernel...
2005-08-27  Andreas Herrmann[PATCH] zfcp: add rports to enable scsi_add_device...
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-04  Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-30  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-23  Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-12  Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-06-28  Tony LuckAuto merge with /home/aegl/GIT/ia64-test
2005-06-28  Russell King[PATCH] ARM SMP: TLB implementations only affect local CPU
2005-06-27  Linus TorvaldsMerge /linux/kernel/git/dtor/input.git manually
2005-06-26  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26  Thomas GleixnerMerge with rsync://fileserver/linux
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-23  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-22  Linus TorvaldsMerge rsync://oss.sgi.com/git/xfs-2.6
2005-06-21  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-21  Linus TorvaldsMerge 'for-linus' branch of /linux/kernel/git/shaggy...
2005-06-21  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-20  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2005-06-20  Yani Ioannou[PATCH] Driver Core: drivers/s390/net/qeth_sys.c -...
2005-06-20  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-20  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-06-19  Russell KingMerge with ../linux-2.6-smp
2005-06-18  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-06-18  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-06-18  Linus TorvaldsMerge 'upstream-2.6.13' branch of /linux/kernel/git...
2005-06-18  Linus TorvaldsManual merge of /linux/kernel/git/jgarzik/netdev-2...
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-17  Jeff Garzik [SCSI] allow sleeping in ->eh_host_reset_handler()
2005-06-17  Jeff Garzik [SCSI] allow sleeping in ->eh_bus_reset_handler()
2005-06-17  Jeff Garzik [SCSI] allow sleeping in ->eh_device_reset_handler()
2005-06-17  Jeff Garzik [SCSI] allow sleeping in ->eh_abort_handler()
2005-06-14  Andreas Herrmann[SCSI] zfcp: fix bug during adapter shutdown
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2