merge by hand (fix up qla_os.c merge error)
[linux-2.6] / drivers / scsi / ide-scsi.c
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-01  Linus TorvaldsMerge ... /linux/kernel/git/sfrench/cifs-2.6
2005-05-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-31  Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-05-29   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch use-after-unmap
2005-05-27  Christoph HellwigMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-27   <jgarzik@pretzel... Merge ... /linux/kernel/git/torvalds/linux-2.6.git...
2005-05-26  James BottomleyAutomatic merge of ../scsi-misc-2.6-old/
2005-05-26  Linus TorvaldsAutomatic merge of 'for-linus' branch from
2005-05-26  Linus TorvaldsMerge of 'misc-fixes' branch from
2005-05-26  Stuart Hayes[PATCH] ide-scsi: kmap scatter/gather before doing PIO
2005-05-26  Bartlomiej Zolnier... [PATCH] convert IDE device drivers to driver-model
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2