Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:29 +0000 (03:57 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:29 +0000 (03:57 -0500)
commit5f3fdeb6242d84126e4bd45ac9e2246833fe8352
tree011ff83db06c9d42c72544e8c10c06c978ba88ce
parent98a5d024eb589a863c1c79f3c3f8ecb666c0eec9
parentb71d4da092801634d04190693a38ca03bdbe2505
Merge branch 'upstream'
drivers/scsi/libata-core.c