Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:59:55 +0000 (10:59 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:59:55 +0000 (10:59 -0500)
commit02f693c7118f6be9e677070eb630c1f3a654cdd3
treeb5493c816a1f76a01319a84955c5ba07d47517c3
parente7fb585940a3dc87a42ebc30a62296e5cf6f9cd5
parenta18ceba7b40e24a9da87249bd74f16ea5abd6894
Merge branch 'upstream'
drivers/scsi/libata-scsi.c