Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:29 +0000 (12:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:29 +0000 (12:30 -0400)
1  2 
drivers/scsi/libata-scsi.c
include/linux/ata.h

Simple merge
Simple merge