Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)
commit18ee3610040a4c008ce08a40a5dd025241cc7e97
tree32a996a5123726b63c31a1522f230933fb967a32
parente4e7b89280d1d666e2c09e5ad36cf071796c4c7e
parentb4103333d7904310d34de18d85e51e3d74f00a3b
Merge branch 'master'
drivers/scsi/libata-scsi.c
drivers/scsi/scsi_error.c