Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git] / drivers / scsi / qla2xxx / ql2400.c
2006-01-05 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-01-05 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2005-12-15 James BottomleyMerge by hand (conflicts in scsi_lib.c)
2005-12-14 Andrew Vasquez[SCSI] qla2xxx: Add support for embedded ISP24xx firmware.