Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:56:31 +0000 (01:56 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:56:31 +0000 (01:56 -0500)
1  2 
drivers/scsi/libata-core.c

Simple merge