]> err.no Git - linux-2.6/commit
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 11 Feb 2006 23:02:04 +0000 (18:02 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 11 Feb 2006 23:02:04 +0000 (18:02 -0500)
commit1cb9d721d9df9182a42d1ff59427a100c6522efc
tree3c7d47828f89853de49e979f97ffe78fd1dba7d6
parentca7d5e42d783e54f0057317c9226262d68ab7717
parentbef4a456b8dc8b3638f4d49a25a89e1467da9483
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
include/linux/libata.h