Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 03:54:56 +0000 (23:54 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 03:54:56 +0000 (23:54 -0400)
1  2 
drivers/scsi/libata-core.c
include/linux/libata.h

Simple merge
Simple merge