Merge branch 'upstream'
commitce1eeb95fc4eb25109c00bea3e83a87eeff6b07d
authorJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:32:03 +0000 (30 23:32 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:32:03 +0000 (30 23:32 -0500)
treed7a1be22432740af1b9ea4330dd95d5915fdb0c3
parent95dbf5c4be080e94880ead13773d1a14eec8f4de
parent005a5a06a6dd13a0ca3f2c6a0218e8d94ed36d8a
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c