Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:38:52 +0000 (23:38 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:38:52 +0000 (23:38 -0500)
commit0da36b3467040908d3df6bc1f5b4d592a8b23b63
tree4843991fa3a67d9e3cbdfd39eb50574ce8b82c6e
parent8006fdd6dc387abaa4b683bda4868c879fd76070
parentcd52d1ee9a92587b242d946a2300a3245d3b885a
Merge branch 'master'
drivers/scsi/libata-scsi.c