Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
author <jgarzik@pretzel.yyz.us> <>
Thu, 2 Jun 2005 22:43:09 +0000 (18:43 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 2 Jun 2005 22:43:09 +0000 (18:43 -0400)
commitd7aaf48128ec7fcefcee92ea22833afc1a80e268
tree16ff78f6be6a5519944bb7bfc6034dfbd71ae97f
parentdecc6d0b68f27bbb8a0357fccf41936a3c196b03
parent1e86d1c648508fd50e6c9960576b87906a7906ad
Merge ... /spare/repo/linux-2.6/.git branch HEAD
drivers/scsi/ata_piix.c
drivers/scsi/libata-core.c
include/linux/libata.h