Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev...
[powerpc.git] / drivers / scsi / aha1542.h
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] Remove no-op implementations of SCSI EH hooks
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2