Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Sat, 24 Sep 2005 04:26:49 +0000 (00:26 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 24 Sep 2005 04:26:49 +0000 (00:26 -0400)
1  2 
drivers/scsi/libata-core.c
include/linux/libata.h

Simple merge
Simple merge