[IA64] Manual merge fix for 3 files
[linux-2.6] / drivers / scsi / aic7xxx / aic79xx_proc.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-05  Christoph Hellwig[SCSI] aic7xxx: remove aiclib.c
2005-08-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-tmp
2005-08-15  Christoph Hellwig[SCSI] aic79xx: sane pci probing
2005-08-03  James Bottomley[SCSI] aic79xx: fix up transport settings
2005-08-03  Hannes Reinecke[SCSI] aic79xx: update to use scsi_transport_spi
2005-08-03  Hannes Reinecke[SCSI] aic79xx: Remove busyq
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2