Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 04:40:40 +0000 (00:40 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 04:40:40 +0000 (00:40 -0400)
commitae20ea8525a80a863f70d332cf47b71bd9f54c1f
tree9d3cedeb65db521a8436b545bd91641549a18d24
parentf497ba735fc9ff4e35a19641143708b3be1c7061
parent8be3de3fd8469154a2b3e18a4712032dac5b4a53
Merge ... /spare/repo/linux-2.6/.git branch HEAD
drivers/scsi/sata_promise.c