Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 14 Dec 2005 03:22:41 +0000 (22:22 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 14 Dec 2005 03:22:41 +0000 (22:22 -0500)
commite7fb585940a3dc87a42ebc30a62296e5cf6f9cd5
tree6b0290f0cb5f019b792df8580a73f0f852a4e856
parent80c7af4074cbb4cb6be5d35c443ea6d5e8838a84
parentc6329f4df2263ab5a40601a5236639e61b682f51
Merge branch 'upstream'
drivers/scsi/libata-scsi.c