Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 4 Dec 2005 01:34:14 +0000 (20:34 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 4 Dec 2005 01:34:14 +0000 (20:34 -0500)
commit4ef679e6caf1261b6380a610a705a90d7e2738c6
tree6b59360c267508647ae4492f171668ef6ce82e32
parent98ac62defe529d04a192688f40d801a2d8fbcf98
parent9a40525788a1b692ee0fc780a8cdb2ac808de1b0
Merge branch 'upstream-fixes'
drivers/scsi/libata-scsi.c