[IA64] Manual merge fix for 3 files
[linux-2.6] / drivers / scsi / qla2xxx / qla_os.c
2005-09-08  Tony Luck[IA64] Manual merge fix for 3 files
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Len BrownMerge linux-2.6 with linux-acpi-2.6
2005-09-08  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-06  James BottomleyMerge by hand (conflicts in sd.c)
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Stop firmware execution at unintializat...
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Replace schedule_timeout().
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Remove bad call to fc_remove_host(...
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Add host attributes.
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Add change_queue_depth/type() API support.
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Simplify redundant target/device reset...
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Add FDMI support.
2005-09-05  Andrew Vasquez[SCSI] qla2xxx: Use dma_get_required_mask() in determin...
2005-08-29  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29  Jeff Garzik/spare/repo/netdev-2.6 branch 'uli-tulip'
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-15  Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-11  Len BrownMerge acpi-2.6.12 to-akpm
2005-08-05  Len Brown[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
2005-08-04  Len Brown/home/lenb/src/to-akpm branch 'acpi-2.6.12'
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  Jeff Garzik/spare/repo/netdev-2.6 branch 'ieee80211'
2005-07-30  Jeff Garzik/spare/repo/netdev-2.6 branch 'master'
2005-07-30  Dave AirlieMerge ../linux-2.6/
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-14  Andrew Vasquez[SCSI] qla2xxx: Cleanup FC remote port registration.
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Add firmware version number to qla24xx_...
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Update copyright banner.
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Code scrubbing.
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Add OS initialization codes for ISP24xx...
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Add ISP24xx initialization routines.
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Add ISP24xx flash-manipulation routines.
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Add MBX command routines for ISP24xx...
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Add ISP24xx definitions.
2005-07-14  Andrew Vasquez[SCSI] qla2xxx: Factor-out ISP specific functions to...
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-27  Jeff GarzikMerge /spare/repo/netdev-2.6/ branch 'ieee80211'
2005-06-27  Jeff GarzikMerge /spare/repo/linux-2.6/
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-23  Jeff GarzikMerge /spare/repo/linux-2.6/
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  Russell KingMerge with ../linux-2.6-smp
2005-06-18  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
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-15  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-11  Andrew Vasquez[SCSI] qla2xxx: Pull-down scsi-host-addition to follow...
2005-06-08  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-arm
2005-06-08  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git
2005-06-06  Tony Luckauto merge with /home/aegl/GIT/linus
2005-06-06  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-06  Dmitry TorokhovMerge ... /linux/kernel/git/torvalds/linux-2.6
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch skge
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch starfire
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch smc91x
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch remove-drivers
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch iff-running
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch we18
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch viro
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch r8169
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch orinoco-hch
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch ppp
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch hdlc
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch dm9000
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139too-iomap
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/netdev-2.6 branch 8139cp
2005-06-04  Linus TorvaldsAutomatic merge of 'misc-fixes' branch from
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/libata-dev branch svw
2005-06-04   <jgarzik@pretzel... Merge ... /spare/repo/libata-dev branch ahci-msi
next