Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:35:23 +0000 (23:35 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:35:23 +0000 (23:35 -0500)
commitcd8200e6d4f9f05e6ea48f7c000be890337396ac
tree2542b1bca535526750e5e1978091beebf4cf282b
parent122401ce39faab22b29eb11b20e4342f7f566b1b
parent005a5a06a6dd13a0ca3f2c6a0218e8d94ed36d8a
Merge branch 'upstream'
drivers/scsi/libata-core.c