Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 04:51:01 +0000 (23:51 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 04:51:01 +0000 (23:51 -0500)
commit575ab52a218e4ff0667a6cbd972c3af443ee8713
tree047730477e31fe7f0551d25c5454e299926b6500
parentc621b140603dfb4a89809e00f965d42c054871e0
parentdfa159886f38344ede31e3b13ec614e0bebc09c6
Merge branch 'upstream-fixes'
drivers/scsi/libata-core.c