Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:23:11 +0000 (21:23 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:23:11 +0000 (21:23 -0400)
1  2 
drivers/scsi/libata-core.c
include/linux/ata.h
include/linux/libata.h

Simple merge
Simple merge
Simple merge