Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:58:53 +0000 (10:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:58:53 +0000 (10:58 -0500)
commita18ceba7b40e24a9da87249bd74f16ea5abd6894
tree5ce615d345e720ddabf95c46fb62287ee763ad4e
parentaaadff81195056c7c14e0d834b3318c624c0fd78
parent88026842b0a760145aa71d69e74fbc9ec118ca44
Merge branch 'master'
drivers/scsi/libata-scsi.c