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)
1  2 
drivers/scsi/ata_piix.c
drivers/scsi/libata-core.c
include/linux/libata.h

Simple merge
Simple merge
Simple merge