Merge by hand (conflicts in sd.c)
[linux-2.6.git] / drivers / scsi / scsi_error.c
2005-09-06 James BottomleyMerge by hand (conflicts in sd.c)
2005-09-06 Christoph Hellwig[SCSI] unexport scsi_add_timer/scsi_delete_timer
2005-09-06 Christoph Hellwig[SCSI] switch EH thread startup to the kthread API
2005-09-06 Alan Stern[SCSI] return success after retries in scsi_eh_tur
2005-08-28 James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28 James Bottomley[SCSI] convert SPI transport class to scsi_execute
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-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 Mike Anderson[SCSI] host state model update: replace old host bitmap...
2005-07-30 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-29 Linus TorvaldsMerge head 'upstream' of /linux/kernel/git/jgarzik...
2005-07-27 Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/shaggy...
2005-07-27 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-27 Tony LuckAuto merge with /home/aegl/GIT/linus
2005-07-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-26 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-07-26 Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-arm-smp
2005-07-26 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
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-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-26 Christoph Hellwig[SCSI] use list_for_each_entry_safe in scsi_error.c
2005-06-26 Christoph Hellwig[SCSI] remove scsi_eh_eflags_ macros
2005-06-26 Christoph Hellwig[SCSI] remove scsi_cmnd->state
2005-06-26 Christoph Hellwig[SCSI] remove scsi_cmnd->owner
2005-06-26 Christoph Hellwig[SCSI] remove scsi_cmnd->abort_reason
2005-06-23 Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-21 Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
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-05-26 James BottomleyAutomatic merge of ../scsi-misc-2.6-old/
2005-05-20 Patrick Mansfield [SCSI] saved and restore result for timed out commands
2005-05-20 James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-20 Tejun Heo [SCSI] remove spurious if tests from scsi_eh_{times_out...
2005-05-20 Tejun Heo [SCSI] remove unnecessary scsi_delete_timer() call...
2005-05-06 Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-04-26 Linus TorvaldsMerge ... /linux/kernel/git/gregkh/usb-2.6.git/
2005-04-24 Al Viro[PATCH] SCSI GFP fixes
2005-04-19 Linus TorvaldsMerge ... Greg's USB tree at /linux/kernel/git/gregkh...
2005-04-19 James Bottomleyfully merge up to scsi-misc-2.6
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 <htejun@gmail.com>[PATCH] scsi: scsi_send_eh_cmnd() cleanup
2005-04-18 <jejb@titanic.il... scsi: add DID_REQUEUE to the error handling
2005-04-18 <htejun@gmail.com>[PATCH] scsi: remove meaningless scsi_cmnd->serial_numb...
2005-04-18 <htejun@gmail.com>[PATCH] scsi: remove unused scsi_cmnd->internal_timeout...
2005-04-17 <jejb@titanic.il... scsi: add DID_REQUEUE to the error handling
2005-04-17 <htejun@gmail.com>[PATCH] scsi: remove meaningless scsi_cmnd->serial_numb...
2005-04-17 <htejun@gmail.com>[PATCH] scsi: remove unused scsi_cmnd->internal_timeout...
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2