merge by hand (fix up qla_os.c merge error)
[pandora-kernel.git] / drivers / scsi / aic7xxx / aic79xx_osm.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_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-04 Linus TorvaldsAutomatic merge of 'misc-fixes' branch from
2005-06-03 Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6
2005-06-02 <jgarzik@pretzel... Merge ... /spare/repo/linux-2.6/.git branch HEAD
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-30 Linus TorvaldsAutomatic merge of 'misc-fixes' branch from
2005-05-29 Linus TorvaldsAutomatic merge of 'for-linus' branch from
2005-05-28 Shaohua Li[PATCH] swsusp: ahd_dv_0 can't be stopped
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 <hch@lst.de>[PATCH] remove old scsi data direction macros
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2